From: Steve Sutton <steve@gaslightmedia.com>
Date: Mon, 2 Feb 2015 19:24:43 +0000 (-0500)
Subject: Merge branch 'release/1.36'
X-Git-Tag: v1.36
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=287a2e483e8436f9633fe21d01be57dca3c07f66;p=WP-Plugins%2FGaslightify.git

Merge branch 'release/1.36'
---

05db72d525a71247f9b98b19b2c9ddad581bca2d