From: Steve Sutton <steve@gaslightmedia.com>
Date: Fri, 16 Dec 2016 14:51:55 +0000 (-0500)
Subject: Merge tag 'v1.2.5' into develop
X-Git-Tag: v1.2.8^2~5
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=b8d0505a4501fbe806452ca9b37f31c5a7ca7103;p=web%2FTroutCreek.git

Merge tag 'v1.2.5' into develop

Version 1.2.5
---

b8d0505a4501fbe806452ca9b37f31c5a7ca7103