Merge remote-tracking branch 'joyent/v0.12' into v0.12
authorBen Noordhuis <info@bnoordhuis.nl>
Wed, 29 Oct 2014 15:15:15 +0000 (16:15 +0100)
committerBen Noordhuis <info@bnoordhuis.nl>
Wed, 29 Oct 2014 15:15:15 +0000 (16:15 +0100)
commit3a9754a27bf3b39fd4f83925fefdd3875b24b851
tree44f4911c82ef0cdc843cbe596fc9659b6b3c1f8b
parentcee3f51cef2ce22434faabc0b38e60c5a45b8d8d
parentc2b4f4809b8c30537b08f2dc76f798ea7a225907
Merge remote-tracking branch 'joyent/v0.12' into v0.12

Conflicts:
lib/path.js