From: Steve Sutton <steve@gaslightmedia.com>
Date: Wed, 20 Aug 2014 18:13:52 +0000 (-0400)
Subject: Merge branch 'hotfix/1.0.12'
X-Git-Tag: v1.0.12
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=c971c28f37dc688f1e5a3b73154638d6ee31602d;p=web%2FKeweenaw.git

Merge branch 'hotfix/1.0.12'
---

f7f3366adf65fc02f4ab61ccd51c2c58669cc75f