From: intrigeri <intrigeri@boum.org>
Date: Mon, 24 Nov 2008 20:54:11 +0000 (+0100)
Subject: Merge branch 'master' into pub/master
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/a605ee2c562323dc29852787c48a28bd03706718

Merge branch 'master' into pub/master
---

a605ee2c562323dc29852787c48a28bd03706718