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

Merge branch 'hotfix/1.1.1'
---

9f709623fb52dfeff298cfe39314933d9107163c