From: Matthew Vernon <matthewv@chiark.greenend.org.uk>
Date: Wed, 17 Aug 2011 12:59:31 +0000 (+0100)
Subject: Merge branch 'master' of /u2/matthewv/bare-repos/irc
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~matthewv/git?a=commitdiff_plain;h=9ae314358c572f5e8616544a804f43612270e788;p=irc.git

Merge branch 'master' of /u2/matthewv/bare-repos/irc
---

9ae314358c572f5e8616544a804f43612270e788
diff --cc trouts
index df91af4,817ec72..df91af4
mode 100755,100644..100644
--- a/trouts
+++ b/trouts