From: Chuck Scott <cscott@gaslightmedia.com>
Date: Thu, 18 Jun 2015 21:05:14 +0000 (-0400)
Subject: Merge branch 'hotfix/1.0.4'
X-Git-Tag: v1.0.4^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=ed90357bfefc0efab0da0361b6176fcb8fa499a2;p=WP-Themes%2FTomsMomsCookies.git

Merge branch 'hotfix/1.0.4'
---

ed90357bfefc0efab0da0361b6176fcb8fa499a2