From: Steve Sutton <steve@gaslightmedia.com>
Date: Fri, 29 Apr 2016 14:14:09 +0000 (-0400)
Subject: Merge branch 'hotfix/1.0.4'
X-Git-Tag: v1.0.4
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=c63e2792d19554d25e536513817e7a566b56428a;p=WP-Themes%2Fjollylama.git

Merge branch 'hotfix/1.0.4'
---

4f2555deaec31676497f0b95c6e373d8dd75a42e