Merge branch 'develop' of cvs2:WP-Themes/westernup into develop
authorIan Weller <ian@gaslightmedia.com>
Mon, 3 Aug 2015 18:26:35 +0000 (14:26 -0400)
committerIan Weller <ian@gaslightmedia.com>
Mon, 3 Aug 2015 18:26:35 +0000 (14:26 -0400)

Trivial merge