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

Merge branch 'hotfix/1.0.7'
---

098dec3ff1b374ed81090ad576812d76802372bd