From: Steve Sutton <steve@gaslightmedia.com>
Date: Tue, 16 Jun 2015 14:39:05 +0000 (-0400)
Subject: Merge branch 'hotfix/1.1.97'
X-Git-Tag: v1.1.98~1
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=5306ce22c66254ca2deba24ca8bd612654d0299f;p=WP-Themes%2Fgilmoremuseum.git

Merge branch 'hotfix/1.1.97'
---

5306ce22c66254ca2deba24ca8bd612654d0299f