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

Merge branch 'hotfix/1.1.96'
---

31c8c92085798944f796407533b1352deced5aae