From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 28 Dec 2011 01:55:52 +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=fbbc973b010b39d15364dbb8693ef15ad93b7555;p=topgit.git

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

fbbc973b010b39d15364dbb8693ef15ad93b7555