From: intrigeri <intrigeri@boum.org>
Date: Mon, 24 Nov 2008 21:38:31 +0000 (+0100)
Subject: Merge commit 'upstream/master' into pub/master
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/603a0ce99c03db9d2a812864f60f16fca60c8673?hp=-c

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

603a0ce99c03db9d2a812864f60f16fca60c8673