From: Laury GvR <laury@gaslightmedia.com>
Date: Wed, 20 Aug 2014 21:03:04 +0000 (-0400)
Subject: Merge branch 'hotfix/1.0.15'
X-Git-Tag: V1.0.15
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=27122b8379027a70a9f000ad456f48dc4e9824dd;p=web%2FKeweenaw.git

Merge branch 'hotfix/1.0.15'
---

d226ba68c133e11cffe5ad7741bf913efaeaaf0b