From: Laury GvR <laury@gaslightmedia.com>
Date: Tue, 23 Feb 2016 17:59:55 +0000 (-0500)
Subject: Merge branch 'hotfix/1.0.1'
X-Git-Tag: v1.0.1
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=6a921fbd813b0eab2dcd5fdb6b237c4720079338;p=WP-Themes%2Fshipwreckmuseum.git

Merge branch 'hotfix/1.0.1'
---

775e0732cba1b08cb64a22d4d81127f673d660bb