From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 28 Dec 2011 02:06:24 +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?a=commitdiff_plain;h=510170a6b5357c10dd2cf1289d1427fe565394e2;p=topgit.git

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

510170a6b5357c10dd2cf1289d1427fe565394e2