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

Merge commit 'upstream/master'
---

713e114f132096c5aec01265ca9703708b47af4f