From: Laury GvR <laury@gaslightmedia.com>
Date: Tue, 16 Jun 2015 15:30:58 +0000 (-0400)
Subject: Merge branch 'hotfix/1.2.0'
X-Git-Tag: v1.2.0^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=867377a5e330ee9de2eb54b592322dcc59ad2ffb;p=WP-Themes%2Fgilmoremuseum.git

Merge branch 'hotfix/1.2.0'
---

867377a5e330ee9de2eb54b592322dcc59ad2ffb