Merge branch 'master' of git://repo.or.cz/alt-git
commit97b117ad5b230430f69405ee49a93021f8da2baf
authorJohannes Sixt <j6t@kdbg.org>
Thu, 3 Apr 2014 05:28:02 +0000 (3 07:28 +0200)
committerJohannes Sixt <j6t@kdbg.org>
Thu, 3 Apr 2014 05:28:02 +0000 (3 07:28 +0200)
tree4dd14019be1a59cc1d5bdf0433884aefe26e77f9
parente51a37f75328de797bd4c4d354cb4e906bd85976
parent125d8ecefe817db2d51dd5a85c287989ef8a0c0b
Merge branch 'master' of git://repo.or.cz/alt-git