From: intrigeri <intrigeri@boum.org>
Date: Mon, 3 Nov 2008 18:47:55 +0000 (+0100)
Subject: Merge commit 'origin'
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/e54ec757d01fd77001fc5efe1942bdeea8ee468f

Merge commit 'origin'
---

e54ec757d01fd77001fc5efe1942bdeea8ee468f