From: Laury GvR <laury@gaslightmedia.com>
Date: Wed, 28 Oct 2015 19:09:43 +0000 (-0400)
Subject: Merge branch 'release/1.0.4'
X-Git-Tag: v1.0.4
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=732a846a5bcba6216be487efd255d419e813db71;p=WP-Themes%2Fwesternup.git

Merge branch 'release/1.0.4'
---

aa4ebb769996b7933a5ac461f4cbbd62b039e3d4