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

Merge commit 'upstream/master' into pub/master
---

4668c290e9c625682c998afc38b76215a212fc10