From: intrigeri <intrigeri@boum.org>
Date: Wed, 5 Nov 2008 00:40:41 +0000 (+0100)
Subject: Merge branch 'master' of ssh://gitosis@vcs.gaffer.ptitcanardnoir.org/ikiwiki
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/75b765259ef6e722c00130280b021da4f1f43ddc?hp=-c

Merge branch 'master' of ssh://gitosis@vcs.gaffer.ptitcanardnoir.org/ikiwiki
---

75b765259ef6e722c00130280b021da4f1f43ddc