From: intrigeri <intrigeri@boum.org>
Date: Thu, 13 Nov 2008 18:09:47 +0000 (+0100)
Subject: Merge commit 'upstream/master' into pub/master
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/f7d89faec9f747a800564b6bd3f9bc155402e37d

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

f7d89faec9f747a800564b6bd3f9bc155402e37d