Merge branch 'master' into next
authorJunio C Hamano <gitster@pobox.com>
Mon, 13 Dec 2010 05:50:52 +0000 (21:50 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 13 Dec 2010 05:50:52 +0000 (21:50 -0800)
commita2ccc1021be2cd130c7900ac27dd4a60ec85985c
tree1ca05fece4746261255c2baad4afae5ec2c71195
parent018bc80d140aff02f61e3a5100dd1367311d38ff
parentb5c178143088350c49129acbedb864d70c666215
Merge branch 'master' into next

* master: