From: Steve Sutton <steve@gaslightmedia.com>
Date: Wed, 27 Aug 2014 14:28:41 +0000 (-0400)
Subject: Merge branch 'release/1.0'
X-Git-Tag: v1.0^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=485970798e5344f1021288fcccb3627d66b6db3d;p=web%2FSooLocks.git

Merge branch 'release/1.0'
---

485970798e5344f1021288fcccb3627d66b6db3d