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

Merge commit 'origin/master'
---

db476e7d1b83f2101a05c161393e04374b4f678e