Merge branch 'master' of git://repo.or.cz/alt-git
commitded8f2671c62276774195ff7cc0ee746e1a47964
authorJohannes Sixt <j6t@kdbg.org>
Wed, 12 Nov 2014 06:35:02 +0000 (12 07:35 +0100)
committerJohannes Sixt <j6t@kdbg.org>
Wed, 12 Nov 2014 06:35:02 +0000 (12 07:35 +0100)
tree29c203d8bb246531ad6c9effdd48e6f596e2229d
parent8736b29c996edd538a7b3dc5dcbf6c8299a15847
parentf6f61cbbad0611e03b712cc354f1665b5d7b087e
Merge branch 'master' of git://repo.or.cz/alt-git