From: Laury GvR <laury@gaslightmedia.com>
Date: Tue, 23 Feb 2016 18:06:30 +0000 (-0500)
Subject: Merge branch 'hotfix/1.0.2'
X-Git-Tag: v1.0.2
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=91515b86f440b4e5d5366b3a7beb4f49dc0166c3;p=WP-Themes%2Fshipwreckmuseum.git

Merge branch 'hotfix/1.0.2'
---

f91a2dc1ab84ac8e6300e74da6e0db4e94ed0c56