From: Steve Sutton <steve@gaslightmedia.com>
Date: Thu, 25 Feb 2016 17:56:05 +0000 (-0500)
Subject: Merge branch 'hotfix/1.0.7'
X-Git-Tag: v1.0.7
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=15cdd089153e880bbab7d2d05583d52ec51b0d8b;p=WP-Themes%2Fshipwreckmuseum.git

Merge branch 'hotfix/1.0.7'
---

ce5818451f4dde05d9b815ee5fa27c9e860a5d45