From: Steve Sutton <steve@gaslightmedia.com>
Date: Tue, 23 Feb 2016 19:38:47 +0000 (-0500)
Subject: Merge tag 'v1.0.5' into develop
X-Git-Tag: v~4
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=6d151dcc276ea12703a3b38d229e40c297bd5533;p=WP-Themes%2Fshipwreckmuseum.git

Merge tag 'v1.0.5' into develop

Version 1.2.5
---

6d151dcc276ea12703a3b38d229e40c297bd5533