From: Laury GvR <laury@gaslightmedia.com>
Date: Wed, 20 Aug 2014 18:36:18 +0000 (-0400)
Subject: Merge branch 'hotfix/1.0.9'
X-Git-Tag: V1.0.9^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=d17c11bb85b360ab516f48a900948bfb08fd3447;p=web%2FKeweenaw.git

Merge branch 'hotfix/1.0.9'
---

d17c11bb85b360ab516f48a900948bfb08fd3447