Merge branch 'MDL-11047' of git://github.com/mackensen/moodle

Conflicts:
	mod/quiz/version.php

diff --cc mod/quiz/lang/en/quiz.php
Simple merge

diff --cc mod/quiz/version.php
index 25dba1a,42f5240..122bfeb
--- 1/mod/quiz/version.php
--- 2/mod/quiz/version.php
+++ b/mod/quiz/version.php
@@@ -25,7 -25,7 +25,7 @@@
  
  defined('MOODLE_INTERNAL') || die();
  
- $module->version   = 2012030900;       // The current module version (Date: YYYYMMDDXX)
 -$module->version   = 2011120704;       // The current module version (Date: YYYYMMDDXX)
 -$module->requires  = 2011112900;       // Requires this Moodle version
++$module->version   = 2012030901;       // The current module version (Date: YYYYMMDDXX)
 +$module->requires  = 2012030100.04;    // Requires this Moodle version
  $module->component = 'mod_quiz';       // Full name of the plugin (used for diagnostics)
  $module->cron      = 60;