Merge branch 'master' of git://repo.or.cz/alt-git
commitc01111e053d06f026397916c1392aea225a527cc
authorJohannes Sixt <j6t@kdbg.org>
Mon, 29 Sep 2014 05:39:02 +0000 (29 07:39 +0200)
committerJohannes Sixt <j6t@kdbg.org>
Mon, 29 Sep 2014 05:39:02 +0000 (29 07:39 +0200)
treee0ee9028e05cad9a759d3f57bd4a95b0a62887b8
parent050650e51248404b505f479556d7039bdd34b568
parenta9583afc1df1df10d60d2b81fd4b0976bc67ca4e
Merge branch 'master' of git://repo.or.cz/alt-git