From: Chuck Scott <cscott@gaslightmedia.com>
Date: Mon, 23 Nov 2015 20:25:13 +0000 (-0500)
Subject: Merge branch 'hotfix/1.2.15'
X-Git-Tag: v1.2.15
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=612677f24ca247c3fca4f3f0b7de3d860eb98688;p=WP-Themes%2Fgilmoremuseum.git

Merge branch 'hotfix/1.2.15'
---

e9c6a906d60b4907ec65f19ce60c18cc9c9a0196