From: intrigeri <intrigeri@boum.org>
Date: Thu, 13 Nov 2008 18:03:29 +0000 (+0100)
Subject: Merge commit 'origin/master'
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/7f744c0444f64087e1c598007730599b01642954

Merge commit 'origin/master'
---

7f744c0444f64087e1c598007730599b01642954