Merge branch 'master' of git://repo.or.cz/alt-git
commit4232451932850dc031ab7e64df23a1d78dd31a98
authorJohannes Sixt <j6t@kdbg.org>
Wed, 7 May 2014 05:44:44 +0000 (7 07:44 +0200)
committerJohannes Sixt <j6t@kdbg.org>
Wed, 7 May 2014 05:44:44 +0000 (7 07:44 +0200)
treeec7a7caffb3d8f7e27cbadd6bcc5695ef00c7464
parent5815d488d4673ea652be207add27c3b6ea49de32
parentb4f86a4ce85e4e370a67455de6586a02f158a789
Merge branch 'master' of git://repo.or.cz/alt-git