Merge branch 'master' of git://repo.or.cz/alt-git
commit4d525333002c58894cd4f64e4a4754371f8288a6
authorJohannes Sixt <j6t@kdbg.org>
Sun, 5 Aug 2012 16:44:24 +0000 (5 18:44 +0200)
committerJohannes Sixt <j6t@kdbg.org>
Sun, 5 Aug 2012 16:44:24 +0000 (5 18:44 +0200)
tree9a60cdb7c38b9d57a2c903b535a41c2bd112990f
parent31fce2a9f258bd1ec8f71a25f19182ff74e1dd91
parent9a7365cfa45637056e764f1f4759fcd34c4c1822
Merge branch 'master' of git://repo.or.cz/alt-git