From: intrigeri <intrigeri@boum.org>
Date: Sat, 8 Nov 2008 17:03:04 +0000 (+0100)
Subject: Merge commit 'upstream/master' into pub/master
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/17f01c3237dd9a91ccb4bbc3ec13d75dc17285a0

Merge commit 'upstream/master' into pub/master
---

17f01c3237dd9a91ccb4bbc3ec13d75dc17285a0