From: Steve Sutton <steve@gaslightmedia.com>
Date: Wed, 20 Aug 2014 18:14:02 +0000 (-0400)
Subject: Merge tag 'v1.0.12' into develop
X-Git-Tag: v1.1.30^2~20
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=bbf62e099f736cdd14781a630417064ef299b2c6;p=web%2FKeweenaw.git

Merge tag 'v1.0.12' into develop

Version 1.0.12
---

bbf62e099f736cdd14781a630417064ef299b2c6