From: Steve Sutton <steve@gaslightmedia.com>
Date: Thu, 28 Apr 2016 14:00:16 +0000 (-0400)
Subject: Merge branch 'hotfix/1.0.3'
X-Git-Tag: v1.0.3^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=c0cbced214aa12c1068f2910efdd86d2dee9ea29;p=WP-Themes%2Fjollylama.git

Merge branch 'hotfix/1.0.3'
---

c0cbced214aa12c1068f2910efdd86d2dee9ea29