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

Merge commit 'upstream/master'
---

6975f9e3f4e06fb55cc8c9795c503019d2e8d08b