From: Ian Weller <ian@gaslightmedia.com>
Date: Wed, 20 Apr 2016 19:52:18 +0000 (-0400)
Subject: Merge branch 'hotfix/1.0.4'
X-Git-Tag: 1.0.4
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=fe6fcd25779105b11a562ae6ad507e917b747ea2;p=WP-Themes%2Fcamppetosega.git

Merge branch 'hotfix/1.0.4'
---

f3aa818666bf9c1d163ef490197a0addffbd18a5