From: Ian Weller <ian@gaslightmedia.com>
Date: Thu, 19 May 2016 16:57:39 +0000 (-0400)
Subject: Merge branch 'hotfix/1.0.17'
X-Git-Tag: v1.0.17^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=f6b45de73abad705e1943247e3a937687edb561d;p=WP-Themes%2FTomsMomsCookies.git

Merge branch 'hotfix/1.0.17'
---

f6b45de73abad705e1943247e3a937687edb561d