From: Laury GvR <laury@gaslightmedia.com>
Date: Wed, 30 Mar 2016 20:33:32 +0000 (-0400)
Subject: Merge branch 'hotfix/1.0.12'
X-Git-Tag: v1.0.12
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=5945c01249d0377006cc7e1caefba222c42468d1;p=web%2FSooLocks.git

Merge branch 'hotfix/1.0.12'
---

46f5729616573920dad1822824518a2d61b12401