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

Merge commit 'upstream/master'
---

b0f5f37317242721765d463ad7785b995caee490