From: Ian Weller <ian@gaslightmedia.com>
Date: Fri, 8 Aug 2014 15:49:57 +0000 (-0400)
Subject: Merge branch 'hotfix/1.1.5' into develop
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=73655499b7b35030d5cc0d080d5562a87bbf3d7b;p=web%2FBigFore.git

Merge branch 'hotfix/1.1.5' into develop
---

73655499b7b35030d5cc0d080d5562a87bbf3d7b