Merge branch 'master' into next
commit3316dfdcf48d3b302a035d3eecbd261fa12f2414
authorJunio C Hamano <gitster@pobox.com>
Fri, 16 Mar 2012 04:56:18 +0000 (15 21:56 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 16 Mar 2012 04:56:18 +0000 (15 21:56 -0700)
treef1c8730d52da50db2c1b3241367463c1e83bda6b
parent38e1251a4abf75d6f2ce839f27cea2f57690fd15
parenta99c5e5921fcb4fd003fd3424be4db649393731f
Merge branch 'master' into next

* master: