From: cscott <cscott@gaslightmedia.com>
Date: Thu, 4 Sep 2014 17:34:54 +0000 (-0400)
Subject: Merge branch 'hotfix/1.0.3'
X-Git-Tag: 1.0.3
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=639a5bff135b3aa9b646d69135d78ad55666158b;p=web%2FSooLocks.git

Merge branch 'hotfix/1.0.3'
---

ed7229af77f42133dc2f2510c25c918a4d9dbe67