From: Ian Weller <ian@gaslightmedia.com>
Date: Fri, 23 Oct 2015 12:53:21 +0000 (-0400)
Subject: Merge branch 'develop' of cvs2:WP-Themes/shipwreckmuseum into develop
X-Git-Tag: v1.0.0^2~97
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=57e76f3974a36eb68f6c04266651c01374a8e3f5;p=WP-Themes%2Fshipwreckmuseum.git

Merge branch 'develop' of cvs2:WP-Themes/shipwreckmuseum into develop
---

57e76f3974a36eb68f6c04266651c01374a8e3f5