Merge branch 'master' of git://github.com/gitster/git
commitddede7d957eec55855670b68618292144d9e8730
authorJohannes Sixt <j6t@kdbg.org>
Thu, 17 Nov 2011 07:13:33 +0000 (17 08:13 +0100)
committerJohannes Sixt <j6t@kdbg.org>
Thu, 17 Nov 2011 07:13:33 +0000 (17 08:13 +0100)
tree157328fd92c2d6acd96d8df815c0559f5f8a6f0d
parent3711608158a5944c7d7831fb8895989c8c01b0dd
parent09116a1c31e3754cb18bb69ef057342cd7808935
Merge branch 'master' of git://github.com/gitster/git