From: intrigeri <intrigeri@boum.org>
Date: Mon, 10 Nov 2008 11:21:40 +0000 (+0100)
Subject: Merge commit 'upstream/master'
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/9b474c2d488839ceec3637c3089eede45a715948

Merge commit 'upstream/master'
---

9b474c2d488839ceec3637c3089eede45a715948