Merge branch 'dev'

README

@@ -1,7 +1,7 @@
 === TGM Plugin Activation ===
 Contributors:      Thomas Griffin (@jthomasgriffin / thomasgriffinmedia.com)
                    Gary Jones (Github: @GaryJones / Twitter: GaryJ)
-Version:           2.3.2
+Version:           2.3.3
 Requires at least: 3.0.0
 Tested up to:      3.3.1
 
@@ -35,6 +35,10 @@ You can also follow project progress and updates on Twitter. Follow us here at h
 
 == Changelog ==
 
+= 2.3.3 =
+
+* Changed license to reflect GPL v2 or later (to be compatible with the WordPress repo)
+
 = 2.3.2 =
 
 * Fixed bug (100%) with not loading class properly

tgm-plugin-activation/class-tgm-plugin-activation.php

@@ -3,11 +3,11 @@
  * Plugin installation and activation for WordPress themes.
  *
  * @package   TGM-Plugin-Activation
- * @version   2.3.2
+ * @version   2.3.3
  * @author    Thomas Griffin <thomas@thomasgriffinmedia.com>
  * @author    Gary Jones <gamajo@gamajo.com>
  * @copyright Copyright (c) 2012, Thomas Griffin
- * @license   http://opensource.org/licenses/gpl-3.0.php GPL v3
+ * @license   http://opensource.org/licenses/gpl-2.0.php GPL v2 or later
  * @link      https://github.com/thomasgriffin/TGM-Plugin-Activation
  */
 

tgm-plugin-activation/example.php

@@ -8,11 +8,11 @@
  *
  * @package	   TGM-Plugin-Activation
  * @subpackage Example
- * @version	   2.3.2
+ * @version	   2.3.3
  * @author	   Thomas Griffin <thomas@thomasgriffinmedia.com>
  * @author	   Gary Jones <gamajo@gamajo.com>
  * @copyright  Copyright (c) 2012, Thomas Griffin
- * @license	   http://opensource.org/licenses/gpl-3.0.php GPL v3
+ * @license	   http://opensource.org/licenses/gpl-2.0.php GPL v2 or later
  * @link       https://github.com/thomasgriffin/TGM-Plugin-Activation
  */