Merge branch 'master' of git://repo.or.cz/alt-git
commit1aebf40501fefd4ca02241303687e01f1c0ee38e
authorJohannes Sixt <j6t@kdbg.org>
Wed, 15 Oct 2014 05:41:47 +0000 (15 07:41 +0200)
committerJohannes Sixt <j6t@kdbg.org>
Wed, 15 Oct 2014 05:41:47 +0000 (15 07:41 +0200)
treea2c33d89651133c2d8535f67c9bee51307494fb1
parent9dd5b620d5bb58ab07314f4635b38e0b06d6fa9d
parent670a3c1d5a27bfb1cc6b526559c6f5874f00042f
Merge branch 'master' of git://repo.or.cz/alt-git