Merge branch 'MDL-42585-master' of git://github.com/damyon/moodle

Conflicts:
	mod/assign/version.php

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

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

diff --cc mod/assign/tests/locallib_test.php
Simple merge

diff --cc mod/assign/version.php
index 47ed041,c43122b..60a2aa6
--- 1/mod/assign/version.php
--- 2/mod/assign/version.php
+++ b/mod/assign/version.php
@@@ -25,7 -25,7 +25,7 @@@
  defined('MOODLE_INTERNAL') || die();
  
  $module->component = 'mod_assign'; // Full name of the plugin (used for diagnostics).
- $module->version  = 2013110502;    // The current module version (Date: YYYYMMDDXX).
 -$module->version  = 2013121300;    // The current module version (Date: YYYYMMDDXX).
++$module->version  = 2014010700;    // The current module version (Date: YYYYMMDDXX).
  $module->requires = 2013110500;    // Requires this Moodle version.
  $module->cron     = 60;