From: intrigeri <intrigeri@boum.org>
Date: Sat, 8 Nov 2008 17:03:04 +0000 (+0100)
Subject: Merge commit 'upstream/master'
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/a4a1b8e6532b38cc3d045647b568cb2e6d737524

Merge commit 'upstream/master'
---

a4a1b8e6532b38cc3d045647b568cb2e6d737524