From: Laury GvR <laury@gaslightmedia.com>
Date: Fri, 29 Jul 2016 13:41:09 +0000 (-0400)
Subject: Merge branch 'hotfix/1.0.25'
X-Git-Tag: v1.0.25^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=479cb045599cc57ab2d9487d2022bfb699595140;p=WP-Themes%2Fwesternup.git

Merge branch 'hotfix/1.0.25'
---

479cb045599cc57ab2d9487d2022bfb699595140