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

Merge commit 'upstream/master'
---

61ac01babc25e804c2948815580df6b3781206b6