From: intrigeri <intrigeri@boum.org>
Date: Tue, 11 Nov 2008 13:15:18 +0000 (+0100)
Subject: Merge commit 'upstream/master' into pub/master
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/56e18bc00900debc2c3f457d013f366f4d3dea98?hp=56e18bc00900debc2c3f457d013f366f4d3dea98

Merge commit 'upstream/master' into pub/master
---