From: Steve Sutton <steve@gaslightmedia.com>
Date: Fri, 9 Jan 2015 15:39:29 +0000 (-0500)
Subject: Merge branch 'hotfix/1.0.7'
X-Git-Tag: v1.0.7^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=0187523ddd48af1653a9cf47f447bdadbbd0d969;p=web%2FSooLocks.git

Merge branch 'hotfix/1.0.7'
---

0187523ddd48af1653a9cf47f447bdadbbd0d969