From: Laury GvR <laury@gaslightmedia.com>
Date: Tue, 5 Jan 2016 19:25:56 +0000 (-0500)
Subject: Merge branch 'hotfix/1.0.5'
X-Git-Tag: v1.0.5^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=4f1eb59387bfda885b6b976554ee4c6c7ad424f3;p=WP-Themes%2Fwesternup.git

Merge branch 'hotfix/1.0.5'
---

4f1eb59387bfda885b6b976554ee4c6c7ad424f3