From: Steve Sutton <steve@gaslightmedia.com>
Date: Tue, 23 Feb 2016 21:15:40 +0000 (-0500)
Subject: Merge branch 'hotfix/1.0.6'
X-Git-Tag: v1.0.6^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=b347b11a702d19afcff631c6fdbee46bccc26564;p=WP-Themes%2Fshipwreckmuseum.git

Merge branch 'hotfix/1.0.6'
---

b347b11a702d19afcff631c6fdbee46bccc26564