From: Jason Skomorowski <jason@indexdata.com>
Date: Mon, 22 Sep 2014 13:32:46 +0000 (-0400)
Subject: Merge branch 'master' into templateallthemarkup
X-Git-Tag: 1.0.0~324^2~26
X-Git-Url: http://sru.miketaylor.org.uk/?a=commitdiff_plain;h=8ecc7b5621fa3f7191205e6ce93a8ef097e873bd;p=mkws-moved-to-github.git

Merge branch 'master' into templateallthemarkup
---

8ecc7b5621fa3f7191205e6ce93a8ef097e873bd