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

Merge tag 'v1.0.5' into develop

Version 1.0.5
---

4d8254223b5b0ca0cb6f08cb42da5540e2dc4907