From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon, 6 Oct 2014 13:25:52 +0000 (+0100)
Subject: Merge remote branch 'origin/master'
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~webstump/git?a=commitdiff_plain;h=cb2220b4847b84df144c3b2b59d80b039c8b210b;p=modbot-ulm.git

Merge remote branch 'origin/master'
---

cb2220b4847b84df144c3b2b59d80b039c8b210b