Merge branch 'master' of git://repo.or.cz/alt-git
commitac05e3a0d2ff199122737c3699dc0a973f736b7e
authorJohannes Sixt <j6t@kdbg.org>
Fri, 3 Jun 2011 06:18:08 +0000 (3 08:18 +0200)
committerJohannes Sixt <j6t@kdbg.org>
Fri, 3 Jun 2011 06:18:08 +0000 (3 08:18 +0200)
treed14ffb2f754a59b5b184c81ea20682d260841973
parentc84aed89a8280f69295e4f4fd159cbbc6a8322ea
parenta6605d76cdad37ed3c55a7be4d2e0af0f4721bb2
Merge branch 'master' of git://repo.or.cz/alt-git