From: Laury GvR <laury@gaslightmedia.com>
Date: Wed, 23 Mar 2016 19:54:47 +0000 (-0400)
Subject: Merge branch 'hotfix/2.0.4'
X-Git-Tag: v2.0.4
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=4afe0792f5fdf4a22120b4fc8d98e3c36d6b1148;p=WP-Themes%2Falpenfest.git

Merge branch 'hotfix/2.0.4'
---

7f37cb3b932ca7699d257fea3adfb3c3eeb3ec56