From: Anthony Talarico <talarico@gaslightmedia.com>
Date: Mon, 12 Sep 2016 16:58:52 +0000 (-0400)
Subject: Merge branch 'hotfix/1.0.13'
X-Git-Tag: v1.0.13
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=163a1a8bb5b777cbac6e3d7d6619030f30ee1b78;p=WP-Themes%2Fshipwreckmuseum.git

Merge branch 'hotfix/1.0.13'
---

ecf1892c8b08344b11726b951e8059e6112d2026