From: Steve Sutton <steve@gaslightmedia.com>
Date: Thu, 7 Jan 2016 21:15:43 +0000 (-0500)
Subject: Merge tag 'v1.3.12' into develop
X-Git-Tag: v1.1.14^2~6
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=1e39d4611a6048c29146e33a1f817a95c0ece554;p=web%2FKeweenaw.git

Merge tag 'v1.3.12' into develop

Version 1.3.12
---

1e39d4611a6048c29146e33a1f817a95c0ece554