Merge branch 'develop' of cvs2:WP-Themes/GovernmentEmmet into develop
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 12 Nov 2015 17:23:58 +0000 (12:23 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 12 Nov 2015 17:23:58 +0000 (12:23 -0500)

Trivial merge