From: intrigeri <intrigeri@boum.org>
Date: Tue, 11 Nov 2008 03:41:59 +0000 (+0100)
Subject: Merge commit 'upstream/master'
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/b19d19df7ab9d5d6a3ba1887d52457fed44c1333

Merge commit 'upstream/master'
---

b19d19df7ab9d5d6a3ba1887d52457fed44c1333