From: Ian Weller <ian@gaslightmedia.com>
Date: Tue, 26 Jul 2016 20:54:47 +0000 (-0400)
Subject: Merge branch 'hotfix/1.0.30'
X-Git-Tag: v1.0.30^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=8116b724fad969e5d7692886c222234f1c3b3fa7;p=web%2FTroutCreek.git

Merge branch 'hotfix/1.0.30'
---

8116b724fad969e5d7692886c222234f1c3b3fa7