From: Laury GvR <laury@gaslightmedia.com>
Date: Tue, 14 Apr 2015 18:36:02 +0000 (-0400)
Subject: Merge branch 'hotfix/1.1.6'
X-Git-Tag: v1.1.6
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=7e31dc0483d4f521c8663a28f7fe9bca1b296db6;p=WP-Themes%2Fgilmoremuseum.git

Merge branch 'hotfix/1.1.6'
---

f0ae5b23e15b693f7d379eaa4958679064215a2d