Merge branch 'master' of git://repo.or.cz/alt-git
commit68fc3dbbbd204da7f328c38e7890cb0533b27314
authorJohannes Sixt <j6t@kdbg.org>
Tue, 9 Dec 2014 06:35:12 +0000 (9 07:35 +0100)
committerJohannes Sixt <j6t@kdbg.org>
Tue, 9 Dec 2014 06:35:12 +0000 (9 07:35 +0100)
treed6e55d0cce7477532ce0fde28f6b3f4e31a3736c
parentded8f2671c62276774195ff7cc0ee746e1a47964
parentc18b86734113ee2aeb0e140c922c8fbd4accc860
Merge branch 'master' of git://repo.or.cz/alt-git