From: Fedor Indutny <fedor@indutny.com>
Date: Fri, 24 Oct 2014 12:52:29 +0000 (+0400)
Subject: Merge remote-tracking branch 'origin/v0.12' into v0.12
X-Git-Tag: v1.0.0~304
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=be17aa4385c609fe8401c5209c59aee39291d169;p=platform%2Fupstream%2Fnodejs.git

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
---

be17aa4385c609fe8401c5209c59aee39291d169
diff --cc lib/path.js
index 44ef0d6,fc5e650..a39031e
--- a/lib/path.js
+++ b/lib/path.js
@@@ -163,6 -163,11 +163,11 @@@ if (isWindows) 
      resolvedTail = normalizeArray(resolvedTail.split(/[\\\/]+/).filter(f),
                                    !resolvedAbsolute).join('\\');
  
 -     // If device is a drive letter, we'll normalize to lower case.
 -     if (resolvedDevice && resolvedDevice.charAt(1) === ':')
 -       resolvedDevice = resolvedDevice[0].toLowerCase() +
 -        resolvedDevice.substr(1);
++    // If device is a drive letter, we'll normalize to lower case.
++    if (resolvedDevice && resolvedDevice.charAt(1) === ':')
++      resolvedDevice = resolvedDevice[0].toLowerCase() +
++          resolvedDevice.substr(1);
+ 
      return (resolvedDevice + (resolvedAbsolute ? '\\' : '') + resolvedTail) ||
             '.';
    };