From: Laury GvR <laury@gaslightmedia.com>
Date: Thu, 27 Oct 2016 20:34:08 +0000 (-0400)
Subject: Merge branch 'hotfix/1.0.14'
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=a744f957ce308b8255f90fe8d239a6406077e07a;p=WP-Themes%2Fglmthemes%2Fshipwreck-theme.git

Merge branch 'hotfix/1.0.14'
---

a744f957ce308b8255f90fe8d239a6406077e07a