Sync with maint
commit118f60ee06612083ff4f1810424e80a3e896f73e
authorJunio C Hamano <gitster@pobox.com>
Mon, 22 Apr 2013 18:33:31 +0000 (22 11:33 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 22 Apr 2013 18:33:31 +0000 (22 11:33 -0700)
treeb71da18751c592e7459e2b8309523f5b30689374
parent3d88f83db212b6ac70eac68cd5f3a6461ed3194f
parent3e7bb5da9f58a8b0d066d1511ab95b5df2f8c6b1
Sync with maint