Merge branch 'master' into next
commite4bfc232282c53cbe18e8f382b9a7d6967b77e7e
authorJunio C Hamano <gitster@pobox.com>
Thu, 10 Jan 2013 22:39:00 +0000 (10 14:39 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 10 Jan 2013 22:39:00 +0000 (10 14:39 -0800)
tree3de839245f73f789117d0da8babb670c5bd6a701
parentffbe6f75280588398438a571a8a937328d87c3a3
parenta27d83aee906a767ae12dc39cd0aa5b42448bd6c
Merge branch 'master' into next