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

Merge branch 'hotfix/1.1.97' into develop
---

07a42af6c6a3a61ab805d929f8b3135a52e35550