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