Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Sat, 12 Jan 2013 02:33:27 +0000 (18:33 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sat, 12 Jan 2013 02:33:27 +0000 (18:33 -0800)
commit06fb494474fac626a410005c7d5364626153c69f
tree53dcd92312302b6097e8306da360e783d0ae7e4e
parenta27d83aee906a767ae12dc39cd0aa5b42448bd6c
parentab60f2ce2ddd1e0199dbc778bfb054a532badde0
Merge branch 'maint'