Merge branch 'master' of git://repo.or.cz/alt-git
commit7a346b090a4cb3672d844d683e5474813406c112
authorJohannes Sixt <j6t@kdbg.org>
Tue, 19 Nov 2013 06:33:28 +0000 (19 07:33 +0100)
committerJohannes Sixt <j6t@kdbg.org>
Tue, 19 Nov 2013 06:33:28 +0000 (19 07:33 +0100)
tree8033965d18e691793ce3b3fa7d92e94722ae06a5
parent01d262a4b5e904351bc66eee18c4c1cb5f820d94
parentc6f1b920ac8b41b9175910d5866924a12a0ce6b9
Merge branch 'master' of git://repo.or.cz/alt-git