Sync with 2.1.2
authorJunio C Hamano <gitster@pobox.com>
Tue, 30 Sep 2014 05:17:57 +0000 (22:17 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 30 Sep 2014 05:17:57 +0000 (22:17 -0700)
* maint:
Git 2.1.2

Trivial merge