From: Ian Jackson <ian@liberator.relativity.greenend.org.uk>
Date: Sun, 12 Sep 2010 18:52:34 +0000 (+0100)
Subject: Merge branch 'master' into stable-6.x
X-Git-Tag: 6.7.0~14
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-live.git;a=commitdiff_plain;h=c57d4c361a88f00f0d6dfc3bcb20f87f1d957527

Merge branch 'master' into stable-6.x
---

c57d4c361a88f00f0d6dfc3bcb20f87f1d957527