From: Jason Skomorowski <jason@indexdata.com>
Date: Thu, 21 Aug 2014 20:04:18 +0000 (-0400)
Subject: Merge branch 'master' into templateallthemarkup
X-Git-Tag: 1.0.0~324^2~29
X-Git-Url: http://jsfdemo.indexdata.com/cgi-bin?a=commitdiff_plain;h=f46b615e92b693ca8bea0eb3fb0fab65c4fbf46e;p=mkws-moved-to-github.git

Merge branch 'master' into templateallthemarkup
---

f46b615e92b693ca8bea0eb3fb0fab65c4fbf46e