From: Steve Sutton <steve@gaslightmedia.com>
Date: Mon, 1 Feb 2016 19:00:17 +0000 (-0500)
Subject: Merge tag 'v1.2' into develop
X-Git-Tag: v1.4.1^2
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=b35f95010c2fc18a441c386d88d7143c21e6f960;p=web%2FKeweenaw.git

Merge tag 'v1.2' into develop

Version 1.2
---

b35f95010c2fc18a441c386d88d7143c21e6f960