From: Simon McVittie <smcv@debian.org>
Date: Sun, 18 Mar 2012 15:31:41 +0000 (+0000)
Subject: Merge tag '3.20120202' into trail3-integrated
X-Git-Tag: 3.20120203~23^2~3
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/4e54fa1144065b7ff99e88e6c61ff1fdcf6175c9?hp=4e54fa1144065b7ff99e88e6c61ff1fdcf6175c9

Merge tag '3.20120202' into trail3-integrated
---