From: Steve Sutton <steve@gaslightmedia.com>
Date: Tue, 15 Dec 2015 15:16:24 +0000 (-0500)
Subject: Merge branch 'release/1.0.0'
X-Git-Tag: v1.0.0^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=62e227358bddef8b5e19d7c4a9af9f3b7f685224;p=WP-Themes%2Fupwatertrails.git

Merge branch 'release/1.0.0'
---

62e227358bddef8b5e19d7c4a9af9f3b7f685224