From: Ian Weller <ian@gaslightmedia.com>
Date: Mon, 5 Oct 2015 20:49:54 +0000 (-0400)
Subject: Merge branch 'hotfix/1.2.5'
X-Git-Tag: v1.2.6~1
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=935998ce6cb1eddcd08636379d229847d5a5029c;p=WP-Themes%2Fgilmoremuseum.git

Merge branch 'hotfix/1.2.5'
---

935998ce6cb1eddcd08636379d229847d5a5029c