Merge branch 'master' of git://repo.or.cz/alt-git
commitcc1003e360fd39d49fa1a1c1eb6c6554fef3370c
authorJohannes Sixt <j6t@kdbg.org>
Thu, 19 Jan 2012 07:18:43 +0000 (19 08:18 +0100)
committerJohannes Sixt <j6t@kdbg.org>
Thu, 19 Jan 2012 07:18:43 +0000 (19 08:18 +0100)
treea7540ae763edaf9d4b78ebadef71a9fa1b4bcd42
parent283b5993efba015913d2448a8913e3a52420403b
parentbddcefc6380bd6629f3f12b5ffd856ec436c6abd
Merge branch 'master' of git://repo.or.cz/alt-git