From: Steve Sutton <steve@gaslightmedia.com>
Date: Thu, 29 Dec 2016 15:58:17 +0000 (-0500)
Subject: Merge branch 'release/1.2.0'
X-Git-Tag: v1.2.0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=3219e71d34d0ae745295a9147f79bb924369ca54;p=WP-Themes%2FSierraSands.git

Merge branch 'release/1.2.0'
---

23e51092cdf45e5dfce1275eb2261d28fab2d289