From: Steve Sutton <steve@gaslightmedia.com>
Date: Tue, 9 Jun 2015 15:13:34 +0000 (-0400)
Subject: Merge branch 'hotfix/1.3.3'
X-Git-Tag: v1.3.3^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=0e05826423f80410a0ac22cb0193d3372beff19e;p=web%2FKeweenaw.git

Merge branch 'hotfix/1.3.3'
---

0e05826423f80410a0ac22cb0193d3372beff19e