Merge branch 'master' of cvs2.gaslightmedia.com:WP-Plugins/glm-woocommerce-merchant...
authorChuck Scott <cscott@gaslightmedia.com>
Thu, 11 Jun 2015 14:31:38 +0000 (10:31 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Thu, 11 Jun 2015 14:31:38 +0000 (10:31 -0400)

Trivial merge