From: Steve Sutton <steve@gaslightmedia.com>
Date: Mon, 1 Feb 2016 18:59:59 +0000 (-0500)
Subject: Merge branch 'hotfix/1.2'
X-Git-Tag: v1.2^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=c3a721e3efd9dee9f344ff76b16f3c86f1c27aee;p=web%2FKeweenaw.git

Merge branch 'hotfix/1.2'
---

c3a721e3efd9dee9f344ff76b16f3c86f1c27aee