From: Laury GvR <laury@gaslightmedia.com>
Date: Wed, 20 Aug 2014 18:44:26 +0000 (-0400)
Subject: Merge branch 'hotfix/1.0.14'
X-Git-Tag: V1.0.14
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=8f1572e02b34953c095f0777b66b1d8511bc1f18;p=web%2FKeweenaw.git

Merge branch 'hotfix/1.0.14'
---

d20d2d0fc03bf6d0d85bec6646c28dabeef5d1f3