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

Merge tag 'v1.0.18' into develop

Version 1.0.18
---

2b1a7ad38ddcb4387d4032fb2e97db0f8e6e28af