Merge branch 'master' of git://repo.or.cz/alt-git
commit9dd5b620d5bb58ab07314f4635b38e0b06d6fa9d
authorJohannes Sixt <j6t@kdbg.org>
Fri, 10 Oct 2014 05:29:55 +0000 (10 07:29 +0200)
committerJohannes Sixt <j6t@kdbg.org>
Fri, 10 Oct 2014 05:29:55 +0000 (10 07:29 +0200)
tree11c778bcd97fa8f6190ed1ab9d398949cba57e29
parent2cd901eac63d7e38e446b7e690cc7e14782102b3
parent63a45136a329bab550425c3142db6071434d935e
Merge branch 'master' of git://repo.or.cz/alt-git