From: Anthony Talarico <talarico@gaslightmedia.com>
Date: Mon, 9 May 2016 19:04:01 +0000 (-0400)
Subject: Merge tag 'v1.0.26' into develop
X-Git-Tag: v1.0.35^2~8
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=cbfbc621f76d705634e3bb9eec6dc9e5ccb86737;p=web%2FTroutCreek.git

Merge tag 'v1.0.26' into develop

v1.0.26
---

cbfbc621f76d705634e3bb9eec6dc9e5ccb86737