From: Steve Sutton <steve@gaslightmedia.com>
Date: Mon, 24 Oct 2016 15:21:28 +0000 (-0400)
Subject: Merge tag 'v1.2.0' into develop
X-Git-Tag: v1.2.4^2~4
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=a08646c6dbc6df7889519939f1d01c11058e1bba;p=web%2FTroutCreek.git

Merge tag 'v1.2.0' into develop

Version 1.2.0
---

a08646c6dbc6df7889519939f1d01c11058e1bba