Merge branch 'master' of git://repo.or.cz/alt-git
commit7318e55ed00c20b31b04727ead82fe4257dc8ac4
authorJohannes Sixt <j6t@kdbg.org>
Tue, 5 May 2015 05:46:57 +0000 (5 07:46 +0200)
committerJohannes Sixt <j6t@kdbg.org>
Tue, 5 May 2015 05:46:57 +0000 (5 07:46 +0200)
treecb22458608beaef297b9f692f57189e2462fabf0
parentd080f718bbebfec18fac8193aa4a4318f3f080ac
parent3d4a3ffe64162b45ae7c991fc60623ecb4678cfd
Merge branch 'master' of git://repo.or.cz/alt-git