From: Steve Sutton <steve@gaslightmedia.com>
Date: Fri, 16 Jan 2015 16:51:18 +0000 (-0500)
Subject: Merge branch 'hotfix/1.2.34'
X-Git-Tag: v1.2.34^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=f48c5b10a075f69db7fc2b58e0ba7d9f46083082;p=web%2FKeweenaw.git

Merge branch 'hotfix/1.2.34'
---

f48c5b10a075f69db7fc2b58e0ba7d9f46083082