From: intrigeri <intrigeri@boum.org>
Date: Thu, 13 Nov 2008 03:38:48 +0000 (+0100)
Subject: Merge commit 'upstream/master'
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/6d98c5290f2542552979e374d8e3dcbef51f31a6

Merge commit 'upstream/master'
---

6d98c5290f2542552979e374d8e3dcbef51f31a6