From: Steve Sutton <steve@gaslightmedia.com>
Date: Thu, 14 Jan 2016 21:44:49 +0000 (-0500)
Subject: Merge branch 'hotfix/1.0.6'
X-Git-Tag: v1.0.6^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=3779e9b51f08a82ba52596d77d04f6b9a971f4f2;p=WP-Themes%2Fwesternup.git

Merge branch 'hotfix/1.0.6'
---

3779e9b51f08a82ba52596d77d04f6b9a971f4f2