From: Laury GvR <laury@gaslightmedia.com>
Date: Wed, 30 Mar 2016 20:26:07 +0000 (-0400)
Subject: Merge branch 'hotfix/1.0.11'
X-Git-Tag: v1.0.11
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=4eed8cbdaf8d3fb40cfa39a598773439176b6a30;p=web%2FSooLocks.git

Merge branch 'hotfix/1.0.11'
---

573678da3a9c6bee4da00b560308343b434e9a86