From: Simon McVittie <smcv@debian.org>
Date: Fri, 7 Jan 2011 20:09:09 +0000 (+0000)
Subject: Merge branch 'ready/tag-test' into transient-tag
X-Git-Tag: 3.20110225~78^2~3
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/040038b6559140b4a8c04396098ade2b4d4573b9

Merge branch 'ready/tag-test' into transient-tag
---

040038b6559140b4a8c04396098ade2b4d4573b9