From: Ian Weller <ian@gaslightmedia.com>
Date: Tue, 5 Jul 2016 19:59:26 +0000 (-0400)
Subject: Merge tag 'v1.0.12' into develop
X-Git-Tag: v1.0.24^2~13
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=8d08d934fbf3710b76563d8a319ff44bdff9d355;p=WP-Themes%2Fshipwreckmuseum.git

Merge tag 'v1.0.12' into develop

version 1.0.12
---

8d08d934fbf3710b76563d8a319ff44bdff9d355