From: Steve Sutton <steve@gaslightmedia.com>
Date: Tue, 9 Feb 2016 14:43:06 +0000 (-0500)
Subject: Merge branch 'release/1.0.2'
X-Git-Tag: v1.0.2
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=ce4874f0ccee9f13c26a7ddb3403757012479aa1;p=WP-Themes%2Fupwatertrails.git

Merge branch 'release/1.0.2'
---

23462ed1f456d906bddd9a37184ea5eb5e62f7d1