From: Florian Forster Date: Wed, 23 Jun 2010 08:33:44 +0000 (+0200) Subject: Merge branch 'master' of verplant.org:/var/lib/git/collection4 X-Git-Tag: v4.0.0~198 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=aaf63df27b244028582cfd078e82189110501043;p=collection4.git Merge branch 'master' of verplant.org:/var/lib/git/collection4 --- aaf63df27b244028582cfd078e82189110501043