From: Steve Sutton <steve@gaslightmedia.com>
Date: Mon, 2 Nov 2015 21:15:58 +0000 (-0500)
Subject: Merge tag 'v1.0.12' into develop
X-Git-Tag: v1.0.35^2~22
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=631b3ecf778844dd416c5cb2f13eecb209280a67;p=web%2FTroutCreek.git

Merge tag 'v1.0.12' into develop

Version 1.0.12
---

631b3ecf778844dd416c5cb2f13eecb209280a67