From: intrigeri <intrigeri@boum.org>
Date: Wed, 3 Dec 2008 09:44:20 +0000 (+0100)
Subject: Merge commit 'upstream/master' into pub/master
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/2c19ce29ee915b0646a7676771902bd3933c5650

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

2c19ce29ee915b0646a7676771902bd3933c5650