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

Merge commit 'origin/master'
---

736657a8bb9da2440e3e0222e3d4de06c6b2f30e