From: Laury GvR <laury@gaslightmedia.com>
Date: Wed, 30 Mar 2016 20:26:11 +0000 (-0400)
Subject: Merge tag 'v1.0.11' into develop
X-Git-Tag: v1.0.17^2~6
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=9f95c217d61f813b377beae7d6b3b531a323acce;p=web%2FSooLocks.git

Merge tag 'v1.0.11' into develop

v1.0.11
---

9f95c217d61f813b377beae7d6b3b531a323acce