Merge branch 'master' into next
commita16470ad2aab8a2d6af49aece095cad12e0c8352
authorJunio C Hamano <gitster@pobox.com>
Fri, 14 Jun 2013 15:53:32 +0000 (14 08:53 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 14 Jun 2013 15:53:32 +0000 (14 08:53 -0700)
treef0b30223544c502b9e3146e3386372bcd5ebdc4f
parent2821441d44d4083cfefede6f5919cd8117adb0d2
parentbdff0e3a374617dce784f801b97500d9ba2e4705
Merge branch 'master' into next

* master: