From: Steve Sutton <steve@gaslightmedia.com>
Date: Thu, 9 Jun 2016 15:42:29 +0000 (-0400)
Subject: Merge branch 'hotfix/1.0.9'
X-Git-Tag: v1.0.9
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=abc74a5bedf8ce0f7737ccd270f21fe80c9b4c40;p=WP-Themes%2Fshipwreckmuseum.git

Merge branch 'hotfix/1.0.9'
---

c9b515ca06d41a3a540b394c1abd7d0304ca2300