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

Merge branch 'hotfix/1.0.5'
---

ab1874f3c47d3f565276ebe9b3db76b2646a96ec