Merge branch 'maint'
commitb7973fbbc3f8f72df352f4ef1a2ff325db92c36f
authorJunio C Hamano <gitster@pobox.com>
Tue, 27 Nov 2012 21:29:08 +0000 (27 13:29 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 27 Nov 2012 21:29:08 +0000 (27 13:29 -0800)
treeef64c2b4be6232c965129030a63492a96e823d27
parent77b598b438e51d45229fe945e2139a7789a150bc
parent86ef7b37f921dccff6d940fb17005e0906a2bf3e
Merge branch 'maint'