From: Laury GvR <laury@gaslightmedia.com>
Date: Wed, 20 Aug 2014 14:15:32 +0000 (-0400)
Subject: Merge branch 'release/1.0'
X-Git-Tag: V1.0^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=69e533398ed9a80bc9d452991d6168b1b8faa0ee;p=web%2FKeweenaw.git

Merge branch 'release/1.0'
---

69e533398ed9a80bc9d452991d6168b1b8faa0ee