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

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

efcbaefa79b3d3fc868bc09c5ab6402e129443fc