From: intrigeri <intrigeri@boum.org>
Date: Fri, 7 Nov 2008 10:52:19 +0000 (+0100)
Subject: Merge commit 'upstream/master'
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/f38a64a9a7965f06b204d50e739db5b5a5cfe306?hp=-c

Merge commit 'upstream/master'
---

f38a64a9a7965f06b204d50e739db5b5a5cfe306