Merge branch 'master' of git://repo.or.cz/alt-git
commit283b5993efba015913d2448a8913e3a52420403b
authorJohannes Sixt <j6t@kdbg.org>
Tue, 10 Jan 2012 06:39:42 +0000 (10 07:39 +0100)
committerJohannes Sixt <j6t@kdbg.org>
Tue, 10 Jan 2012 06:39:42 +0000 (10 07:39 +0100)
treee24c27c145de177167b911e59796dac689046636
parent844dd9bfe146e44f413ce35d1ca8064cb988980e
parentbeecc7ab65b31c5471331e64acaa3f722125ea67
Merge branch 'master' of git://repo.or.cz/alt-git