From: Anthony Talarico <talarico@gaslightmedia.com>
Date: Mon, 9 May 2016 18:33:27 +0000 (-0400)
Subject: Merge branch 'hotfix/1.0.25'
X-Git-Tag: v1.0.25
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=48f174ec374d9e610cc145cb799874320eb3d43a;p=web%2FTroutCreek.git

Merge branch 'hotfix/1.0.25'
---

a81321a1b9da94b34379d8db51b2266e59c7868c