From: Steve Sutton <steve@gaslightmedia.com>
Date: Fri, 20 Feb 2015 16:39:19 +0000 (-0500)
Subject: Merge branch 'hotfix/1.0.4'
X-Git-Tag: v1.0.4
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=571f9618e172206f907c1833f4a8046c4f7758e2;p=web%2FTroutCreek.git

Merge branch 'hotfix/1.0.4'
---

9a0b5757ae14b52a35229c1a60a4ca79c41b7dee