From: Ian Weller <ian@gaslightmedia.com>
Date: Thu, 19 May 2016 14:48:45 +0000 (-0400)
Subject: Merge branch 'hotfix/1.2.25'
X-Git-Tag: v1.2.25
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=d067e53cd8fc90bf002ca676474639a7edfb1ff0;p=WP-Themes%2Fgilmoremuseum.git

Merge branch 'hotfix/1.2.25'
---

33e67fc3addcd5e8badda1d365ddb8660bc5e590