From: Laury GvR <laury@gaslightmedia.com>
Date: Thu, 13 Aug 2015 18:51:36 +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=1e286692ea3d90b2ff9700c39314eb044404192c;p=WP-Themes%2Fmcgulpinpoint.git

Merge branch 'hotfix/1.0.4'
---

1e286692ea3d90b2ff9700c39314eb044404192c