From: Laury GvR <laury@gaslightmedia.com>
Date: Thu, 2 Jul 2015 17:32:43 +0000 (-0400)
Subject: Merge branch 'hotfix/1.2.1'
X-Git-Tag: v1.2.1
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=be7a360c5543df5e28dc0f518096194d6b027967;p=WP-Themes%2Fgilmoremuseum.git

Merge branch 'hotfix/1.2.1'
---

bbe05c56e75981ea573b6a09c3541b1ee6b6ca77