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

Merge tag 'v1.0.17' into develop

Version 1.0.17
---

c1f72b2c8218cfe112e7b96fd20d01377f51f599