From: intrigeri <intrigeri@boum.org>
Date: Fri, 7 Nov 2008 20:29:36 +0000 (+0100)
Subject: Merge commit 'upstream/master'
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/1fea8bdde17b04f81138587c235423d21a0620e0?hp=--cc

Merge commit 'upstream/master'
---

1fea8bdde17b04f81138587c235423d21a0620e0