From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 28 Dec 2011 01:52:37 +0000 (+0000)
Subject: Merge commit 'refs/top-bases/i/basis-merge' into i/basis-merge
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=topgit.git;a=commitdiff_plain;h=c4966db6cae694317ab5af8a05924809c95eaab9

Merge commit 'refs/top-bases/i/basis-merge' into i/basis-merge
---

c4966db6cae694317ab5af8a05924809c95eaab9