From: intrigeri <intrigeri@boum.org>
Date: Mon, 10 Nov 2008 20:34:02 +0000 (+0100)
Subject: Merge commit 'origin/master'
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/cd279b55ba5563809c6fcb476f51ee4d0e730c97?hp=-c

Merge commit 'origin/master'
---

cd279b55ba5563809c6fcb476f51ee4d0e730c97