From: Steve Sutton <steve@gaslightmedia.com>
Date: Tue, 10 Mar 2015 19:04:20 +0000 (-0400)
Subject: Merge branch 'hotfix/1.0.6'
X-Git-Tag: v1.0.6
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=da247159de30542dc071120bb3ea2bed9cd6152a;p=web%2FTroutCreek.git

Merge branch 'hotfix/1.0.6'
---

af670fb7c20bec79a634e26ec52f01a3cdd191d3