From: Ian Weller <ian@gaslightmedia.com>
Date: Tue, 5 Jul 2016 19:58:57 +0000 (-0400)
Subject: Merge branch 'hotfix/1.0.12'
X-Git-Tag: v1.0.12
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=98fc4dda6506d507a09e7caec42c1b7e664a2e49;p=WP-Themes%2Fshipwreckmuseum.git

Merge branch 'hotfix/1.0.12'
---

50ee6232ef1a0f19c05091c7b8f8fd935d40ffa7