From: Laury GvR <laury@gaslightmedia.com>
Date: Wed, 20 Aug 2014 16:47:22 +0000 (-0400)
Subject: Merge branch 'hotfix/1.0.8'
X-Git-Tag: V1.0.8
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=4247e4c7c0138e0de1722466b3a160b03521c71e;p=web%2FKeweenaw.git

Merge branch 'hotfix/1.0.8'
---

c1ec7c865333c67c63e422f92da62b6b0e360f45