From: Laury GvR <laury@gaslightmedia.com>
Date: Thu, 21 Aug 2014 18:05:55 +0000 (-0400)
Subject: Merge branch 'hotfix/1.0.21'
X-Git-Tag: V1.0.21
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=4565b74de263e0be6e7fba13809f0f03a22562ae;p=web%2FKeweenaw.git

Merge branch 'hotfix/1.0.21'
---

9bc85e438c7b35a2b83c7bc572ee7dad989753b5