From: intrigeri <intrigeri@boum.org>
Date: Tue, 4 Nov 2008 22:37:51 +0000 (+0100)
Subject: Merge commit 'upstream/master'
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/b39a76849d3c90ffc68627d1d6fe6cb5a821b215?hp=--cc

Merge commit 'upstream/master'
---

b39a76849d3c90ffc68627d1d6fe6cb5a821b215