Merge branch 'develop' of cvs2:WP-Themes/mountpleasantwow into develop
authorIan Weller <ian@gaslightmedia.com>
Thu, 1 Oct 2015 19:46:13 +0000 (15:46 -0400)
committerIan Weller <ian@gaslightmedia.com>
Thu, 1 Oct 2015 19:46:13 +0000 (15:46 -0400)
fixed error


Trivial merge