From: Anonymous <anonymous@none>
Date: Tue, 26 Oct 2010 15:57:58 +0000 (+0200)
Subject: Merge remote branch 'remotes/origin/master'
X-Git-Tag: 3.20101112~50^2~14
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/c2f01e320df8a27c0ac16fb38fba099925dbd010

Merge remote branch 'remotes/origin/master'
---

c2f01e320df8a27c0ac16fb38fba099925dbd010