From: Ian Jackson <ian@liberator.relativity.greenend.org.uk>
Date: Thu, 24 Sep 2009 18:11:13 +0000 (+0100)
Subject: Merge branch 'stable-3.x'
X-Git-Tag: 5.0^2~105
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.web-live.git;a=commitdiff_plain;h=872e647cac241531e4599c8b8b330d8772020253

Merge branch 'stable-3.x'
---

872e647cac241531e4599c8b8b330d8772020253