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

[topgit.git] / .topmsg

diff --git a/.topmsg b/.topmsg
index 7db14ee2452b4cbcb16c90a6cda8dad1b2106004..381f6b564f2b1c39f4d239eea09beaaee09ab0e2 100644 (file)
--- a/.topmsg
+++ b/.topmsg
@@ -1,4 +1,6 @@
-From: martin f. krafft <madduck@debian.org>
-Subject: [PATCH] make file locations Debian-compatible
+From: Ian Jackson <ijackson@chiark.greenend.org.uk>
+Subject: [PATCH] EMPTY - BASIS MERGE
 
-Signed-off-by: martin f. krafft <madduck@debian.org>
+Empty patch for merge of included topic branches, only.
+
+Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>