Merge branch 'master' of verplant.org:/var/lib/git/collection4
authorFlorian Forster <ff@octo.it>
Wed, 23 Jun 2010 08:33:44 +0000 (10:33 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Wed, 23 Jun 2010 08:33:44 +0000 (10:33 +0200)
commitaaf63df27b244028582cfd078e82189110501043
treeccd153d3468e5415ec77f2f2e79a10497372b453
parent80251c6dadb946e41864d75df9af767873514361
parent417610268a16cb4b84d79bf449b1f70142791676
Merge branch 'master' of verplant.org:/var/lib/git/collection4