From: intrigeri <intrigeri@boum.org>
Date: Sat, 8 Nov 2008 16:07:13 +0000 (+0100)
Subject: Merge commit 'upstream/master'
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/92ba3bb4a1b84ffa791fa0be88529e96fd71b157?hp=--cc

Merge commit 'upstream/master'
---

92ba3bb4a1b84ffa791fa0be88529e96fd71b157