From: Laury GvR <laury@gaslightmedia.com>
Date: Thu, 16 Apr 2015 14:16:52 +0000 (-0400)
Subject: Merge branch 'hotfix/1.1.30'
X-Git-Tag: v1.1.30
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=6ddbaf4a0da6cb67e99dba76b3cac912280129de;p=WP-Themes%2Fgilmoremuseum.git

Merge branch 'hotfix/1.1.30'
---

f46cebd8e9954a0fd88f90f22372ae9a0c8cd3d1