From: Laury GvR <laury@gaslightmedia.com>
Date: Wed, 3 Aug 2016 12:35:22 +0000 (-0400)
Subject: Merge branch 'hotfix/1.1.2'
X-Git-Tag: v1.1.2
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=8c7eabae23f784ba22a8aa46093376aaa01c87c1;p=WP-Themes%2Fwesternup.git

Merge branch 'hotfix/1.1.2'
---

f6c8dd32196bd1369d941d6b5e637802a86a4151