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

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

4e1782fb78da29b6d2f2b1b32657ca31ca9aec74