From: Anthony Talarico <talarico@gaslightmedia.com>
Date: Fri, 24 Jun 2016 15:28:11 +0000 (-0400)
Subject: Merge branch 'hotfix/1.0.15'
X-Git-Tag: v1.0.15
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=1fc521a6711712ae9ac76dbd3b97dc126decc9f6;p=WP-Themes%2Fwesternup.git

Merge branch 'hotfix/1.0.15'
---

3f59b0e41db84090f14dba9b0b9f46117efa0736