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

Merge branch 'hotfix/1.1.99'
---

f75952cad6c523769be0e66e015200801721d10d