From: Ian Weller <ian@gaslightmedia.com>
Date: Thu, 13 Aug 2015 19:44:59 +0000 (-0400)
Subject: Merge branch 'hotfix/v1.2.4'
X-Git-Tag: v1.2.4
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=52feb6bce3736b094d4a7d900cf6c1b85048e749;p=WP-Themes%2Fgilmoremuseum.git

Merge branch 'hotfix/v1.2.4'
---

7c00747b37a718544091ac945d7c92a072ca3ee6