From: Jason Skomorowski <jason@indexdata.com>
Date: Mon, 9 Jun 2014 19:26:54 +0000 (-0400)
Subject: Merge branch 'master' into templateallthemarkup
X-Git-Tag: 1.0.0~324^2~66
X-Git-Url: http://sru.miketaylor.org.uk/cgi-bin?a=commitdiff_plain;h=a13ee3189f8ea602aebf9c49827689c28f451dc3;p=mkws-moved-to-github.git

Merge branch 'master' into templateallthemarkup
---

a13ee3189f8ea602aebf9c49827689c28f451dc3