From: Anthony Talarico <talarico@gaslightmedia.com>
Date: Thu, 23 Jun 2016 17:19:33 +0000 (-0400)
Subject: Merge branch 'hotfix/1.0.12'
X-Git-Tag: v1.0.12^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=eec8e14a55afd918e5a8985830991e1f6ea7d087;p=WP-Themes%2Fwesternup.git

Merge branch 'hotfix/1.0.12'
---

eec8e14a55afd918e5a8985830991e1f6ea7d087