From: Steve Sutton <steve@gaslightmedia.com>
Date: Wed, 16 Dec 2015 15:22:07 +0000 (-0500)
Subject: Merge branch 'hotfix/1.0.1'
X-Git-Tag: v1.0.1^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=77a126bdb57169225c4f9e8d4d590e05bda4cc57;p=WP-Themes%2Fupwatertrails.git

Merge branch 'hotfix/1.0.1'
---

77a126bdb57169225c4f9e8d4d590e05bda4cc57