Merge branch 'master' of git://repo.or.cz/alt-git
commitaf4b2ec630c543e5028946cc095d2304fa818441
authorJohannes Sixt <j6t@kdbg.org>
Thu, 12 May 2011 06:20:06 +0000 (12 08:20 +0200)
committerJohannes Sixt <j6t@kdbg.org>
Thu, 12 May 2011 06:20:06 +0000 (12 08:20 +0200)
tree9c6f0fa908fccd6eab8b9ca37f03c7074ea02335
parentfc6974e23aa1f6a940447cf5fe3ae6abd7fa3d56
parentdbe9c5adf95e99c35dd728af2114fccfb9117c65
Merge branch 'master' of git://repo.or.cz/alt-git