Sync with maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 11 Nov 2014 20:45:48 +0000 (12:45 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 11 Nov 2014 20:45:48 +0000 (12:45 -0800)
commitf6f61cbbad0611e03b712cc354f1665b5d7b087e
tree2a3c164fd1d19504cd6f42ee145505229e943710
parent6066a7eac4b2bcdb86971783b583e4e408b32e81
parentcaea1a2bb52262c64fdef545578ee7c5ceb113c5
Sync with maint

* maint: