From: Chuck Scott <cscott@gaslightmedia.com>
Date: Fri, 5 Feb 2016 18:25:15 +0000 (-0500)
Subject: Merge branch 'hotfix/1.0.14'
X-Git-Tag: v1.0.14
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=5173ae0e47c73d198a3fb9412f7d116a684b9412;p=WP-Themes%2FTomsMomsCookies.git

Merge branch 'hotfix/1.0.14'
---

7ef5f602fdc7cc4778729529bafbca66f5a08c1a