From: intrigeri <intrigeri@boum.org>
Date: Thu, 6 Nov 2008 15:30:44 +0000 (+0100)
Subject: Merge commit 'upstream/master' into pub/master
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/caffc0f8de2f7eb7ad16ae8002da52202d0b1754?hp=-c

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

caffc0f8de2f7eb7ad16ae8002da52202d0b1754