From: Steve Sutton <steve@gaslightmedia.com>
Date: Tue, 23 Feb 2016 16:43:49 +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=cebf14cfe2404d369729ec7bc1b108aa933fdf72;p=WP-Themes%2Fshipwreckmuseum.git

Merge branch 'release/1.0.0'
---

d39972eb2d5cd37e0731e8ccfe3e71814d2bbeab