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

Merge tag 'v1.0.12' into develop

v1.0.12
---

9f14f9dab7ad6d8f4a423428e4ea35f9fcd2dc2e