From: Laury GvR <laury@gaslightmedia.com>
Date: Wed, 22 Apr 2015 18:15:51 +0000 (-0400)
Subject: Merge tag 'v1.4.1' into develop
X-Git-Tag: v1.4.2^2~1
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=f42c84eff72a0ac5a02d42ed667ca1fb90bfb788;p=WP-Plugins%2FGaslightify.git

Merge tag 'v1.4.1' into develop

v1.4.1

Conflicts:
	Gaslightify.php
---

f42c84eff72a0ac5a02d42ed667ca1fb90bfb788