From: Anthony Talarico <talarico@gaslightmedia.com>
Date: Tue, 5 Jul 2016 15:47:56 +0000 (-0400)
Subject: Merge branch 'hotfix/1.0.11'
X-Git-Tag: v1.0.11
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=523b79e894aea3fae3f22336984d00734fee843f;p=WP-Themes%2Fshipwreckmuseum.git

Merge branch 'hotfix/1.0.11'
---

07b9f666e1771d20b341affcb8d1bc3c882dd1ce