Merge commit '246cc0e6b52f455dcb1ab23039202d7498d91d30'

Conflicts:
	course/request.php

diff --cc version.php
index ccea6cf,76992dd..ccd4a71
--- 1/version.php
--- 2/version.php
+++ b/version.php
@@@ -29,7 -29,7 +29,7 @@@
  
  defined('MOODLE_INTERNAL') || die();
  
- $version = 2010122900;  // YYYYMMDD   = date of the last version bump
+ $version = 2011010400;  // YYYYMMDD   = date of the last version bump
                          //         XX = daily increments
  
 -$release = '2.0.1+ (Build: 20101229)';  // Human-friendly version name
 +$release = '2.0.1+ (Build: 20110105)';  // Human-friendly version name