From: Laury GvR <laury@gaslightmedia.com>
Date: Tue, 14 Apr 2015 16:11:04 +0000 (-0400)
Subject: Merge branch 'hotfix/1.1.4'
X-Git-Tag: v1.1.4
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=84fea1fa3bbc241c7b0745c21803b0bd214c794d;p=WP-Themes%2Fgilmoremuseum.git

Merge branch 'hotfix/1.1.4'
---

bedb0584d72be9ed056b4cbcf700ed916d3a3306