From: intrigeri <intrigeri@boum.org>
Date: Thu, 6 Nov 2008 11:02:55 +0000 (+0100)
Subject: Merge commit 'upstream/master' into pub/master
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/70353c5807ca950ad652ea9da19665631369d5a6

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

70353c5807ca950ad652ea9da19665631369d5a6