From: Laury GvR <laury@gaslightmedia.com>
Date: Thu, 21 Aug 2014 14:18:01 +0000 (-0400)
Subject: Merge branch 'hotfix/1.0.19'
X-Git-Tag: V1.0.19
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=30a10e02882568ed243d468ea33bded73eac3645;p=web%2FKeweenaw.git

Merge branch 'hotfix/1.0.19'
---

56ca3448b6826acc03bcd3ebc27654d174ec443e