Merge branch 'master' of git://github.com/peff/git
authorJohannes Sixt <j6t@kdbg.org>
Fri, 2 Nov 2012 07:16:11 +0000 (2 08:16 +0100)
committerJohannes Sixt <j6t@kdbg.org>
Fri, 2 Nov 2012 07:16:11 +0000 (2 08:16 +0100)

Trivial merge