From: intrigeri <intrigeri@boum.org>
Date: Tue, 18 Nov 2008 23:05:13 +0000 (+0100)
Subject: Merge commit 'upstream/master'
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/a9e45d868b721de2edba958a41fafa05c548359c?hp=-c

Merge commit 'upstream/master'

Conflicts:

	debian/control
---

a9e45d868b721de2edba958a41fafa05c548359c