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
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=d41e208ad81e77d18a4721bfebaa6b1a16412f96;p=WP-Themes%2Fupwatertrails.git

Merge branch 'release/1.0.0'
---

62e227358bddef8b5e19d7c4a9af9f3b7f685224