From: Laury GvR <laury@gaslightmedia.com>
Date: Mon, 12 Dec 2016 20:25:57 +0000 (-0500)
Subject: Merge branch 'hotfix/1.0.15'
X-Git-Tag: v1.0.15
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=05616149fbefe051ebea92fa049fb6d05d8312c7;p=WP-Themes%2Fshipwreckmuseum.git

Merge branch 'hotfix/1.0.15'
---

635991c5ce528ee8056d53a182ac3db9ac443412