From: Steve Sutton <steve@gaslightmedia.com>
Date: Thu, 11 Jun 2015 22:25:43 +0000 (-0400)
Subject: Merge branch 'hotfix/1.0.2'
X-Git-Tag: v1.0.4~2
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=1bfcbf3e99f33e2369516ef2ae25b0b8d668eed5;p=WP-Themes%2Falpenfest.git

Merge branch 'hotfix/1.0.2'
---

1bfcbf3e99f33e2369516ef2ae25b0b8d668eed5