projects / platform / upstream / nodejs.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2b6a0f8 70195ac)
Merge 'node/v0.12'
authorBert Belder <bertbelder@gmail.com>
Tue, 9 Dec 2014 17:06:35 +0000 (18:06 +0100)
committerBert Belder <bertbelder@gmail.com>
Tue, 9 Dec 2014 17:06:35 +0000 (18:06 +0100)
This merge is effectively a no-op because io.js has already
cherry-picked all the patches from node it needs.

The merge commit serves to establish a new merge base for future merges.


Trivial merge
Domain: Web Framework / Common;