From: Anthony Talarico <talarico@gaslightmedia.com>
Date: Tue, 5 Jul 2016 14:25:36 +0000 (-0400)
Subject: Merge branch 'hotfix/1.0.10'
X-Git-Tag: v1.0.10
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=08c292b722859552e27ae993ebc2c81ff2837cd8;p=WP-Themes%2Fshipwreckmuseum.git

Merge branch 'hotfix/1.0.10'
---

1bae5b549e7cf86759cbc0f691a075993b787889