From: Ian Jackson <ian@liberator.relativity.greenend.org.uk>
Date: Sat, 21 Nov 2009 13:44:21 +0000 (+0000)
Subject: Merge branch 'stable-5.x'
X-Git-Tag: 6.0^0
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.main.git;a=commitdiff_plain;h=b14effcf3ea7900eb4198f6e50112da751f29add

Merge branch 'stable-5.x'
---

b14effcf3ea7900eb4198f6e50112da751f29add