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

Merge remote branch 'origin/master'
---

3fd530b0f541a84071cc6a5298357fb3a43ecbff