Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Mon, 21 Jan 2013 01:27:27 +0000 (17:27 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 21 Jan 2013 01:27:27 +0000 (17:27 -0800)
commit57a011197e9cbf2b7d63302ce9e53db30021d773
tree8c0700f5a3def6d7855f143d1267fe80aefaae9a
parenta8033dfa6e61148db41e8ca30d659f859d949a67
parent74f3267b0cbb9a1026fab3234c4bfefd971fbf9f
Merge branch 'maint'