From: Steve Sutton <steve@gaslightmedia.com>
Date: Tue, 28 Oct 2014 17:09:12 +0000 (-0400)
Subject: Merge branch 'hotfix/1.0.5'
X-Git-Tag: v1.0.5^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=ebf153b6b188192a774f2e2d8feb63f588a87449;p=web%2FSooLocks.git

Merge branch 'hotfix/1.0.5'
---

ebf153b6b188192a774f2e2d8feb63f588a87449