Sync with maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 6 Aug 2012 22:53:33 +0000 (15:53 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 6 Aug 2012 22:53:33 +0000 (15:53 -0700)
commit9ffdd46ae4465f85a5866d96afd5368095e51663
tree9018b752d29e4ccdf90e317485db3daee1baef37
parent9145b19ecf163b9a4aa3c9fda38ca3af41cd52d3
parentb17a01df49a43e0edd7d26397deb79c1b1089d0c
Sync with maint