Merge branch 'MDL-31682' of git://github.com/Lightwork-Marking/moodle

Conflicts:
	mod/assign/version.php

diff --cc mod/assign/externallib.php
Simple merge

diff --cc mod/assign/version.php
index 683d9db,863e1c2..ab394dd
--- 1/mod/assign/version.php
--- 2/mod/assign/version.php
+++ b/mod/assign/version.php
@@@ -24,9 -24,9 +24,9 @@@
  
  defined('MOODLE_INTERNAL') || die();
  
 -$module->component = 'mod_assign'; // Full name of the plugin (used for diagnostics)
 -$module->version  = 2012112901;    // The current module version (Date: YYYYMMDDXX)
 -$module->requires = 2012112900;    // Requires this Moodle version
 +$module->component = 'mod_assign'; // Full name of the plugin (used for diagnostics).
- $module->version  = 2012112900;    // The current module version (Date: YYYYMMDDXX).
++$module->version  = 2012112901;    // The current module version (Date: YYYYMMDDXX).
 +$module->requires = 2012112900;    // Requires this Moodle version.
  $module->cron     = 60;