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

Merge commit 'upstream/master'
---

694a8dcbdd44a07e166baa1708563bc9e6fdff51