Merge branch 'master' into templateallthemarkup
authorJason Skomorowski <jason@indexdata.com>
Mon, 22 Sep 2014 13:36:28 +0000 (09:36 -0400)
committerJason Skomorowski <jason@indexdata.com>
Mon, 22 Sep 2014 13:36:28 +0000 (09:36 -0400)

Trivial merge