From: Jason Skomorowski <jason@indexdata.com>
Date: Tue, 8 Jul 2014 20:23:29 +0000 (-0400)
Subject: Merge branch 'master' into templateallthemarkup
X-Git-Tag: 1.0.0~324^2~54
X-Git-Url: http://git.indexdata.com/?p=mkws-moved-to-github.git;a=commitdiff_plain;h=9300378deb59f8d30bd32b88e41dce88d481249a

Merge branch 'master' into templateallthemarkup
---

9300378deb59f8d30bd32b88e41dce88d481249a