From: cscott <cscott@gaslightmedia.com>
Date: Thu, 28 Aug 2014 18:02:50 +0000 (-0400)
Subject: Merge branch 'hotfix/v1.0.1'
X-Git-Tag: v1.0.1
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=c6e85c10bfdd0ab807640fdceb68abcd68670734;p=web%2FSooLocks.git

Merge branch 'hotfix/v1.0.1'
---

81e3426403c69623470752fe7be95071798c4b89