From: cscott <cscott@gaslightmedia.com>
Date: Fri, 5 Sep 2014 20:23:18 +0000 (-0400)
Subject: Merge branch 'hotfix/1.0.4'
X-Git-Tag: 1.0.4
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=4884346cba52c2963b49c2d27bcbdae03bb5864f;p=web%2FSooLocks.git

Merge branch 'hotfix/1.0.4'
---

5abd174d99085bcdbe67d0f5f8d87a7c5ead20e5