From: Steve Sutton <steve@gaslightmedia.com>
Date: Mon, 2 Nov 2015 21:15:51 +0000 (-0500)
Subject: Merge branch 'hotfix/1.0.12'
X-Git-Tag: v1.0.12^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=d66982f38a28be458b328769d97a3a7c2735f044;p=web%2FTroutCreek.git

Merge branch 'hotfix/1.0.12'
---

d66982f38a28be458b328769d97a3a7c2735f044