From: Michael Howe <michael@michaelhowe.org>
Date: Mon, 11 Aug 2014 19:36:10 +0000 (+0100)
Subject: Merge branch 'master' of svn.michaelhowe.org:scodance
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=7046770a549b5c48817d980db73e14c74a34dbd7;p=scodance.git

Merge branch 'master' of svn.michaelhowe.org:scodance

Conflicts:
	public_html/events.shtml
---

7046770a549b5c48817d980db73e14c74a34dbd7