From: Steve Sutton Date: Wed, 20 Aug 2014 20:41:58 +0000 (-0400) Subject: Merge branch 'hotfix/1.0.18' X-Git-Tag: v1.0.18 X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=df414043b79505d98359d59f43c2fc1392daa98c;p=web%2FKeweenaw.git Merge branch 'hotfix/1.0.18' --- 5a8e9f93e4291b0a47ee9c85f3ec675fa339fd58