From: intrigeri <intrigeri@boum.org>
Date: Fri, 7 Nov 2008 10:50:56 +0000 (+0100)
Subject: Merge commit 'origin/master'
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/3e33482342cf99664662610a18059dce60fbbd44

Merge commit 'origin/master'
---

3e33482342cf99664662610a18059dce60fbbd44