From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 28 Dec 2011 01:33:36 +0000 (+0000)
Subject: Merge branch 'master' into refs/top-bases/debian/locations
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=topgit.git;a=commitdiff_plain;h=b8b7a716e893c5452abe1bc838c49eda628513af

Merge branch 'master' into refs/top-bases/debian/locations
---

b8b7a716e893c5452abe1bc838c49eda628513af