From: Steve Sutton <steve@gaslightmedia.com>
Date: Tue, 23 Feb 2016 19:13:25 +0000 (-0500)
Subject: Merge branch 'hotfix/1.0.4'
X-Git-Tag: v1.0.4^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=d537c7408dbf5764286b0206581b0a71b131e70e;p=WP-Themes%2Fshipwreckmuseum.git

Merge branch 'hotfix/1.0.4'
---

d537c7408dbf5764286b0206581b0a71b131e70e