From: Laury GvR <laury@gaslightmedia.com>
Date: Wed, 20 Aug 2014 18:44:42 +0000 (-0400)
Subject: Merge tag 'V1.0.14' into develop
X-Git-Tag: v1.1.30^2~17
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=5ab767151750d31eb9353bf716b8ba694f667fa1;p=web%2FKeweenaw.git

Merge tag 'V1.0.14' into develop

version 1.0.14
---

5ab767151750d31eb9353bf716b8ba694f667fa1