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

Merge branch 'master' into templateallthemarkup
---

a28667229f37a181910a8d5fff3815c1e3949057