Merge branch 'master' of git://repo.or.cz/alt-git
commitb7dbc14e2eafa936775affc6aaa5c9385e04c4bd
authorJohannes Sixt <j6t@kdbg.org>
Sun, 6 Jan 2013 09:27:00 +0000 (6 10:27 +0100)
committerJohannes Sixt <j6t@kdbg.org>
Sun, 6 Jan 2013 09:27:00 +0000 (6 10:27 +0100)
tree9f3aefd1fe830044e6aaaddc5a03cda82395e986
parent6fc5cc7317be321191f544c32784d16b29e11d66
parent32238aeb730fda0f66ccc6ec2f1e342af8b9fd04
Merge branch 'master' of git://repo.or.cz/alt-git