From: intrigeri <intrigeri@boum.org>
Date: Thu, 6 Nov 2008 11:37:57 +0000 (+0100)
Subject: Merge commit 'origin/master'
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/a020228805485f19e35f72d0be50d1013d5109ec?hp=70353c5807ca950ad652ea9da19665631369d5a6

Merge commit 'origin/master'
---