From: Anthony Talarico <talarico@gaslightmedia.com>
Date: Thu, 2 Feb 2017 14:24:59 +0000 (-0500)
Subject: Merge branch 'hotfix/1.2.18'
X-Git-Tag: v1.2.18
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=fbd6f34c736ef9fc2412656c3f80c7f514c18e86;p=WP-Themes%2Fmountpleasantwow.git

Merge branch 'hotfix/1.2.18'
---

fea2aa41098aa717bf079313d5bef2bdac73056b