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

Merge tag 'v1.2.2' into develop

Version 1.2.2
---

b741b1157f8880b388bd4a31a3478472a818c875