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
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=ee29454207f68e7b12ee457f3a2d249b612eecb9;p=WP-Themes%2Fjollylama.git

Merge branch 'hotfix/1.0.3'
---

c0cbced214aa12c1068f2910efdd86d2dee9ea29