From: intrigeri <intrigeri@boum.org>
Date: Mon, 24 Nov 2008 20:53:25 +0000 (+0100)
Subject: Merge commit 'upstream/master'
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/de9e7da35a337aa9b0ccca35bd564cf069d0d67d

Merge commit 'upstream/master'
---

de9e7da35a337aa9b0ccca35bd564cf069d0d67d