Sync with maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 20 Nov 2012 18:16:34 +0000 (10:16 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 20 Nov 2012 18:16:34 +0000 (10:16 -0800)
commit80dfab86cd36a25cc5ea8124a1b3946e94d200b5
treee9e84c82bd370162b95cf318332103e41a9528f5
parentf3828dc0669826660f5034a468913115675ff501
parent1c03999bef32edabd3db6479279b3ef90cc635ca
Sync with maint

* maint:
  Further preparation for 1.8.0.1