From: intrigeri <intrigeri@boum.org>
Date: Tue, 11 Nov 2008 11:57:41 +0000 (+0100)
Subject: Merge commit 'origin/master'
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/715bad7967c763773d04a4d54ca81c9316c6e2de?hp=--cc

Merge commit 'origin/master'
---

715bad7967c763773d04a4d54ca81c9316c6e2de