From: Steve Sutton <steve@gaslightmedia.com>
Date: Thu, 17 Jul 2014 15:17:11 +0000 (-0400)
Subject: Merge branch 'release/1.0'
X-Git-Tag: v1.0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=f7867aa68d441cbc064a0625d46f5f41c1df1b5b;p=web%2FBigFore.git

Merge branch 'release/1.0'
---

969902c6ff401a19d8247585a327d4026cb2e5ff