From: intrigeri <intrigeri@boum.org>
Date: Thu, 13 Nov 2008 03:40:55 +0000 (+0100)
Subject: Merge commit 'origin/master'
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/2e021e4bfa733db60c821d3788bb8c46445a7c15?hp=--cc

Merge commit 'origin/master'
---

2e021e4bfa733db60c821d3788bb8c46445a7c15