From: Steve Sutton <steve@gaslightmedia.com>
Date: Mon, 3 Aug 2015 16:38:04 +0000 (-0400)
Subject: Merge branch 'hotfix/1.3.6'
X-Git-Tag: V1.3.7~1
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=244acaf5ce3abc638ca0bf3f5a11915ffab2d504;p=web%2FKeweenaw.git

Merge branch 'hotfix/1.3.6'
---

244acaf5ce3abc638ca0bf3f5a11915ffab2d504