From: Jason Skomorowski <jason@indexdata.com>
Date: Mon, 4 Aug 2014 18:12:51 +0000 (-0400)
Subject: Merge branch 'master' into templateallthemarkup
X-Git-Tag: 1.0.0~324^2~48
X-Git-Url: http://lists.indexdata.dk/?a=commitdiff_plain;h=021e380e9d8417bfc48b763258bba6c8fc901040;p=mkws-moved-to-github.git

Merge branch 'master' into templateallthemarkup
---

021e380e9d8417bfc48b763258bba6c8fc901040