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

Merge commit 'upstream/master'
---

f621761b0cf761904e875bc0d2f84a9d38e47ddc