From: intrigeri <intrigeri@boum.org>
Date: Thu, 6 Nov 2008 11:37:57 +0000 (+0100)
Subject: Merge commit 'upstream/master' into pub/master
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/8ded9f57a12a27fa5fc1e272ec7b2d2a5aa28419?hp=-c

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

8ded9f57a12a27fa5fc1e272ec7b2d2a5aa28419