From: Steve Sutton <steve@gaslightmedia.com>
Date: Thu, 7 Aug 2014 12:52:25 +0000 (-0400)
Subject: Merge branch 'hotfix/1.1.3'
X-Git-Tag: v1.1.3^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=5d196dcedc92f499d968a11517481247646261c8;p=web%2FBigFore.git

Merge branch 'hotfix/1.1.3'
---

5d196dcedc92f499d968a11517481247646261c8