Merge branch 'master' of git://repo.or.cz/alt-git
commit22d6ba86434e5781d0ad6b1e7aadea292739b5fc
authorJohannes Sixt <j6t@kdbg.org>
Wed, 18 May 2011 15:19:53 +0000 (18 17:19 +0200)
committerJohannes Sixt <j6t@kdbg.org>
Wed, 18 May 2011 15:19:53 +0000 (18 17:19 +0200)
tree82e483508fe5785b4a4f1c677cdc7e12fdd1e847
parentaf4b2ec630c543e5028946cc095d2304fa818441
parentb602ed7dea968d72c5b3f61ca016de7f285d80ef
Merge branch 'master' of git://repo.or.cz/alt-git