From: Laury GvR <laury@gaslightmedia.com>
Date: Thu, 7 Jul 2016 14:48:24 +0000 (-0400)
Subject: Merge branch 'hotfix/1.0.18'
X-Git-Tag: v1.0.18
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=ffe9ffceddda448c5ed416380561d9b88171723b;p=WP-Themes%2Fwesternup.git

Merge branch 'hotfix/1.0.18'
---

893a5cb26ee5cdde632f84aebcc14f9bdf20610e