From: Steve Sutton <steve@gaslightmedia.com>
Date: Tue, 2 Sep 2014 16:03:18 +0000 (-0400)
Subject: Merge branch 'hotfix/1.0.2'
X-Git-Tag: v1.0.2^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=b2b4d7ec5fe1a89aaebb181b3063af62714ed916;p=web%2FSooLocks.git

Merge branch 'hotfix/1.0.2'
---

b2b4d7ec5fe1a89aaebb181b3063af62714ed916