Merge branch 'maint-1.7.9' into maint
commitfdec2eb8ebbf995a77e2ab9971565c792b52944a
authorJunio C Hamano <gitster@pobox.com>
Tue, 10 Apr 2012 19:44:58 +0000 (10 12:44 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 10 Apr 2012 19:44:58 +0000 (10 12:44 -0700)
treed69e3175e3698793f03328d956af708a051ddab9
parenta961d1f1ea2e3aaef0ff3e75920d1cd830d9b423
parent6eab5f2f14806cf6a7b665d96766a59c13a41f4b
Merge branch 'maint-1.7.9' into maint

* maint-1.7.9: