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

Merge branch 'hotfix/1.0.6'
---

bc68d7f9a394cdae86880de7e66d877f6ccd22a4