From: Steve Sutton <steve@gaslightmedia.com>
Date: Fri, 20 Feb 2015 16:39:28 +0000 (-0500)
Subject: Merge tag 'v1.0.4' into develop
X-Git-Tag: v1.0.5^2~1
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=8989daadf1dbdb3c931567b2eedea1ef624db6d5;p=web%2FTroutCreek.git

Merge tag 'v1.0.4' into develop

Version 1.0.4
---

8989daadf1dbdb3c931567b2eedea1ef624db6d5