From: Laury GvR <laury@gaslightmedia.com>
Date: Wed, 20 Jan 2016 14:02:47 +0000 (-0500)
Subject: Merge branch 'hotfix/1.0.12'
X-Git-Tag: v1.0.12
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=87e1ed7f265fa024d6ea0eeff2152768c2b8e8a2;p=WP-Themes%2Falpenfest.git

Merge branch 'hotfix/1.0.12'
---

9a5e7d1149c0636d62ef4cec4d8637eb6ecc28c0