From: Laury GvR <laury@gaslightmedia.com>
Date: Mon, 22 Jun 2015 15:53:17 +0000 (-0400)
Subject: Merge branch 'hotfix/1.0.4'
X-Git-Tag: v1.0.4^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=f60252390959580e768c40fdcd77867c518845dd;p=WP-Themes%2FSaultHistoricSites.git

Merge branch 'hotfix/1.0.4'
---

f60252390959580e768c40fdcd77867c518845dd