From: intrigeri <intrigeri@boum.org>
Date: Fri, 7 Nov 2008 10:54:09 +0000 (+0100)
Subject: Merge commit 'origin/master'
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/3699c310adfdfefdae2afa35d33794d324aa4122?hp=--cc

Merge commit 'origin/master'
---

3699c310adfdfefdae2afa35d33794d324aa4122