From: Laury GvR <laury@gaslightmedia.com>
Date: Tue, 14 Apr 2015 18:54:41 +0000 (-0400)
Subject: Merge branch 'hotfix/1.1.7'
X-Git-Tag: v1.1.7^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=ee3883a802902b5b5b1b4e2082932b7f1f4cf621;p=WP-Themes%2Fgilmoremuseum.git

Merge branch 'hotfix/1.1.7'
---

ee3883a802902b5b5b1b4e2082932b7f1f4cf621