From: intrigeri <intrigeri@boum.org>
Date: Thu, 13 Nov 2008 03:38:48 +0000 (+0100)
Subject: Merge commit 'origin/master'
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/04301c3becbb4bd37412321eee09dcf5c6b49f97?hp=44dad2157916fcd2bb6d0dfd1fec2d912630e0a8

Merge commit 'origin/master'
---