From: Laury GvR <laury@gaslightmedia.com>
Date: Thu, 21 Aug 2014 18:22:14 +0000 (-0400)
Subject: Merge branch 'hotfix/1.0.23'
X-Git-Tag: V1.0.23^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=27bac775d567bd745301b930e8edb0efb7186455;p=web%2FKeweenaw.git

Merge branch 'hotfix/1.0.23'
---

27bac775d567bd745301b930e8edb0efb7186455