Merge branch 'master' of git://repo.or.cz/alt-git
commita5c5380f76308b52b556e28644f059c8cdb9dc1d
authorJohannes Sixt <j6t@kdbg.org>
Fri, 21 Aug 2015 05:55:13 +0000 (21 07:55 +0200)
committerJohannes Sixt <j6t@kdbg.org>
Fri, 21 Aug 2015 05:55:13 +0000 (21 07:55 +0200)
treeedecafbd8cfe1573ecb161aec415cbcf8b6d1c90
parentad34eb069a9610b1a2751df935a12cf87863f8b6
parentff86faf2fa02bc21933c9e1dcc75c8d81b3e104a
Merge branch 'master' of git://repo.or.cz/alt-git