From: Steve Sutton <steve@gaslightmedia.com>
Date: Tue, 29 Jul 2014 17:37:01 +0000 (-0400)
Subject: Merge branch 'hotfix/1.0.5'
X-Git-Tag: v1.0.5
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=b4d24ad04de576b680320b085659d42f30320ed3;p=web%2FBigFore.git

Merge branch 'hotfix/1.0.5'
---

76671dd5ce42f63e7cb445852ba556734ed42821