Merge branch 'develop' of cvs2:WP-Themes/GilmoreMuseum
authorIan Weller <ian@gaslightmedia.com>
Thu, 13 Aug 2015 20:03:23 +0000 (16:03 -0400)
committerIan Weller <ian@gaslightmedia.com>
Thu, 13 Aug 2015 20:03:23 +0000 (16:03 -0400)

Trivial merge