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

Merge tag 'v1.0.5' into develop

Version 1.0.5
---

b8315937fc56ac447ce2a93465c1531724883552