Merge remote-tracking branch 'origin/v0.12' into v0.12
authorFedor Indutny <fedor@indutny.com>
Fri, 24 Oct 2014 12:52:29 +0000 (16:52 +0400)
committerFedor Indutny <fedor@indutny.com>
Fri, 24 Oct 2014 13:08:37 +0000 (17:08 +0400)
commitbe17aa4385c609fe8401c5209c59aee39291d169
treeead8c4f4f2efa57fa67513749b6cc091719603eb
parent8a00961b812680f460d24c1a9d52f5b2e4b17af3
parentf6e574018090ed4d63596b8a3bb614f8f48b6267
Merge remote-tracking branch 'origin/v0.12' into v0.12

Conflicts:
src/cares_wrap.cc
src/env-inl.h
src/env.h
src/node.cc
src/node.h
src/node_crypto.cc
lib/path.js