From: Simon McVittie Date: Sun, 18 Mar 2012 15:31:41 +0000 (+0000) Subject: Merge tag '3.20120202' into trail3-integrated X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4e54fa1144065b7ff99e88e6c61ff1fdcf6175c9;p=ikiwiki.git Merge tag '3.20120202' into trail3-integrated --- 4e54fa1144065b7ff99e88e6c61ff1fdcf6175c9