From: Anthony Talarico <talarico@gaslightmedia.com>
Date: Mon, 12 Sep 2016 19:17:32 +0000 (-0400)
Subject: Merge branch 'hotfix/1.0.4'
X-Git-Tag: v1.0.4^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=607bfe94068a493eadd031c54a136cd9a379385e;p=WP-Themes%2Fupwatertrails.git

Merge branch 'hotfix/1.0.4'
---

607bfe94068a493eadd031c54a136cd9a379385e