Merge branch 'master' into next
commit94debb8374c6d956221ceb71492d175e5c8fa3f3
authorJunio C Hamano <gitster@pobox.com>
Wed, 8 Dec 2010 19:26:21 +0000 (8 11:26 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 8 Dec 2010 19:26:21 +0000 (8 11:26 -0800)
tree151a8fb4ab7c088abeb32126592d09a8416ad508
parent815bed26271cb19020bd66e5ecbbc79960f794bb
parentf80b6de4eca9c4c4abfe9407736311de27726e53
Merge branch 'master' into next

* master: