From: Steve Sutton <steve@gaslightmedia.com>
Date: Fri, 29 Apr 2016 14:14:20 +0000 (-0400)
Subject: Merge tag 'v1.0.4' into develop
X-Git-Tag: v1.1.0^2~8
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=84aae6796d6f198885bc49170218626326e5c840;p=WP-Themes%2Fjollylama.git

Merge tag 'v1.0.4' into develop

Version 1.0.4
---

84aae6796d6f198885bc49170218626326e5c840