MDL-47494 gapselect: Merge branch 'MOODLE_21_STABLE'

Conflicts:
	lang/en/qtype_gapselect.php

question/type/gapselect/README.txt

@@ -17,7 +17,4 @@ Then add question/type/gapselect to your git ignore.
 
 Alternatively, download the zip from
     https://github.com/moodleou/moodle-qtype_gapselect/zipball/master
-unzip it into the question/type folder, and then rename the new folder to
-gapselect.
-
-
+unzip it into the question/type folder, and then rename the new folder to gapselect.

question/type/gapselect/lang/en/qtype_gapselect.php

@@ -15,10 +15,9 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Language strings for the sdrag-and-drop words into sentences question type.
+ * Language strings for the gap-select question type.
  *
- * @package    qtype
- * @subpackage gapselect
+ * @package    qtype_gapselect
  * @copyright  2011 The Open University
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */

question/type/gapselect/version.php

@@ -17,8 +17,7 @@
 /**
  * Version information for the select missing words question type.
  *
- * @package    qtype
- * @subpackage gapselect
+ * @package    qtype_gapselect
  * @copyright  2011 The Open University
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
@@ -26,4 +25,8 @@
 defined('MOODLE_INTERNAL') || die();
 
 $plugin->version  = 2011020100;
-$plugin->requires = 2011051212;
+$plugin->requires = 2011120500;
+$plugin->cron      = 0;
+$plugin->component = 'qtype_gapselect';
+$plugin->maturity  = MATURITY_STABLE;
+$plugin->release   = '1.0';