From: Anthony Talarico <talarico@gaslightmedia.com>
Date: Mon, 10 Oct 2016 16:25:22 +0000 (-0400)
Subject: Merge branch 'hotfix/1.1.4'
X-Git-Tag: v1.1.4
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=94ee8c2f79708181c736fedb80699888fc971f19;p=WP-Themes%2Fwesternup.git

Merge branch 'hotfix/1.1.4'
---

f32cd280471b0fa0e62432795a327b211cff8ef6