Merge branch 'master' of git://repo.or.cz/alt-git
commit7518845bda2488c7d276d77501bc6f6e97f18cbc
authorJohannes Sixt <j6t@kdbg.org>
Fri, 23 Nov 2012 06:50:21 +0000 (23 07:50 +0100)
committerJohannes Sixt <j6t@kdbg.org>
Fri, 23 Nov 2012 06:50:21 +0000 (23 07:50 +0100)
treea9157163b4b817cc166eba538f09d26eb24f1277
parentc172c6bf46392b4a8c59aa1a548a2514efa1d522
parent2d242fb3fc19fc9ba046accdd9210be8b9913f64
Merge branch 'master' of git://repo.or.cz/alt-git