From: intrigeri <intrigeri@boum.org>
Date: Wed, 12 Nov 2008 11:54:29 +0000 (+0100)
Subject: Merge commit 'upstream/master'
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/44dad2157916fcd2bb6d0dfd1fec2d912630e0a8?hp=44dad2157916fcd2bb6d0dfd1fec2d912630e0a8

Merge commit 'upstream/master'
---