From: Laury GvR <laury@gaslightmedia.com>
Date: Fri, 5 Jun 2015 16:01:14 +0000 (-0400)
Subject: Merge branch 'hotfix/1.3.2'
X-Git-Tag: V1.3.2^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=74fe36f7338b13b0ab1208df15286e0338923104;p=web%2FKeweenaw.git

Merge branch 'hotfix/1.3.2'
---

74fe36f7338b13b0ab1208df15286e0338923104