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

Merge commit 'origin/master'
---

75a4b500a79d182c85d82a1bbdf3fd1650078746