Merge branch 'develop' of cvs2:WP-Themes/csrye into develop
authorIan Weller <ian@gaslightmedia.com>
Wed, 1 Jun 2016 14:15:26 +0000 (10:15 -0400)
committerIan Weller <ian@gaslightmedia.com>
Wed, 1 Jun 2016 14:15:26 +0000 (10:15 -0400)

Trivial merge