From: Anthony Talarico <talarico@gaslightmedia.com>
Date: Fri, 24 Jun 2016 12:17:51 +0000 (-0400)
Subject: Merge branch 'hotfix/1.0.14'
X-Git-Tag: v1.0.14
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=053e0276fba3b59d3d1436af86d1d9460e424b8c;p=WP-Themes%2Fwesternup.git

Merge branch 'hotfix/1.0.14'
---

4db4907a53725bf8dc762a6c8e92936412b8f43f