From: Steve Sutton <steve@gaslightmedia.com>
Date: Sat, 21 May 2016 10:30:06 +0000 (-0400)
Subject: Merge branch 'hotfix/1.5.25'
X-Git-Tag: v1.5.25
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=4ea95c25b5798b7f32c608611012f4cc7d77edf0;p=WP-Themes%2Fmcgulpinpoint.git

Merge branch 'hotfix/1.5.25'
---

234978bdaf07388e376e8efb724dbf1589b50a64