Merge branch 'master' into templateallthemarkup
authorJason Skomorowski <jason@indexdata.com>
Mon, 22 Sep 2014 14:29:04 +0000 (10:29 -0400)
committerJason Skomorowski <jason@indexdata.com>
Mon, 22 Sep 2014 14:29:04 +0000 (10:29 -0400)

Trivial merge