From: Steve Sutton <steve@gaslightmedia.com>
Date: Thu, 17 Jul 2014 16:40:22 +0000 (-0400)
Subject: Merge branch 'hotfix/1.0.2'
X-Git-Tag: v1.0.2^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=90c1d56980c2aa7fc9c1a8ae47dd129b50528f8a;p=web%2FBigFore.git

Merge branch 'hotfix/1.0.2'
---

90c1d56980c2aa7fc9c1a8ae47dd129b50528f8a