From: Ian Jackson <ian@liberator.relativity.greenend.org.uk>
Date: Fri, 14 Aug 2009 19:17:55 +0000 (+0100)
Subject: Merge branch 'stable-3.x'
X-Git-Tag: 3.4~189
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-live.git;a=commitdiff_plain;h=efc8497c2414dfded724d7181e11df53b947e387

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

efc8497c2414dfded724d7181e11df53b947e387