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

Merge tag 'v1.0.26' into develop

Version 1.0.26
---

f540f5b46c404e37fb7c40291d4a53ca0d457cf2