Merge branch 'develop' of cvs2:WP-Themes/shipwreckmuseum into develop
authorIan Weller <ian@gaslightmedia.com>
Fri, 23 Oct 2015 12:53:21 +0000 (08:53 -0400)
committerIan Weller <ian@gaslightmedia.com>
Fri, 23 Oct 2015 12:53:21 +0000 (08:53 -0400)

Trivial merge