Merge branch 'master' into next
commit66efcad0e99623e9e2d20013453899ac6ba13981
authorJunio C Hamano <gitster@pobox.com>
Tue, 27 Nov 2012 21:30:15 +0000 (27 13:30 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 27 Nov 2012 21:30:15 +0000 (27 13:30 -0800)
treeafa11d9b6859a8ec125d5eb1729ed631a31e0795
parent8e8175dad918b9cab47c5ec1bb9cda1b2599ebed
parentb7973fbbc3f8f72df352f4ef1a2ff325db92c36f
Merge branch 'master' into next