From: Anthony Talarico <talarico@gaslightmedia.com>
Date: Fri, 19 Aug 2016 18:28:19 +0000 (-0400)
Subject: Merge branch 'hotfix/1.2.29'
X-Git-Tag: v1.2.29
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=4e35d71b8fdf637024e9571f9e6a33f1c3fdbdb7;p=WP-Themes%2Fgilmoremuseum.git

Merge branch 'hotfix/1.2.29'
---

7c62786b567c8209eb38baaaf11c2095ecf40a20