From: Laury GvR <laury@gaslightmedia.com>
Date: Wed, 20 Aug 2014 15:01:09 +0000 (-0400)
Subject: Merge branch 'hotfix/1.0.2'
X-Git-Tag: V1.0.2^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=e7aaf775bb724672a6183a9d7845c5aecd34b27e;p=web%2FKeweenaw.git

Merge branch 'hotfix/1.0.2'
---

e7aaf775bb724672a6183a9d7845c5aecd34b27e