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

Merge tag 'v1.0.6' into develop

Version 1.0.6
---

bd3c0c60a7b0a11e8f8b9ce72a6d8a4691c5e086