From: Chuck Scott <cscott@gaslightmedia.com>
Date: Thu, 4 Feb 2016 20:44:08 +0000 (-0500)
Subject: Merge branch 'hotfix/1.0.12'
X-Git-Tag: v1.0.12^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=f1c4bf3d6d0ac41d756dfded100a3ed4bf384536;p=WP-Themes%2FTomsMomsCookies.git

Merge branch 'hotfix/1.0.12'
---

f1c4bf3d6d0ac41d756dfded100a3ed4bf384536