From: intrigeri <intrigeri@boum.org>
Date: Tue, 11 Nov 2008 03:39:51 +0000 (+0100)
Subject: Merge commit 'upstream/master'
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/f086baf61f643b1372257492eac5b8ec0df4f164

Merge commit 'upstream/master'
---

f086baf61f643b1372257492eac5b8ec0df4f164