From: intrigeri <intrigeri@boum.org>
Date: Sun, 9 Nov 2008 00:51:00 +0000 (+0100)
Subject: Merge commit 'origin/master'
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/d528db30216af50ac0c3c611a22a3deef25ab026

Merge commit 'origin/master'
---

d528db30216af50ac0c3c611a22a3deef25ab026