From: Jason Skomorowski <jason@indexdata.com>
Date: Mon, 22 Sep 2014 13:36:28 +0000 (-0400)
Subject: Merge branch 'master' into templateallthemarkup
X-Git-Tag: 1.0.0~324^2~25
X-Git-Url: http://git.indexdata.com/?p=mkws-moved-to-github.git;a=commitdiff_plain;h=244089d78df940bd77bd3dbdc10bdbb77e0e9838

Merge branch 'master' into templateallthemarkup
---

244089d78df940bd77bd3dbdc10bdbb77e0e9838