Merge branch 'MDL-31215-master-11' of git://git.luns.net.uk/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 15 May 2012 21:59:07 +0000 (09:59 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 15 May 2012 21:59:45 +0000 (09:59 +1200)
commita5bf3c520fda24b3e4cd5f7819dd064fcca870ee
treea7bf212c5019691aa00a1d4b9e04f10a9b7badce
parentfdbd219b33d7364feaaf8b830be553898ee0c8be
parent7a9a07d24acaa4befd32698a69d26afcd9530437
Merge branch 'MDL-31215-master-11' of git://git.luns.net.uk/moodle

Conflicts:
course/lib.php
course/lib.php
lang/en/moodle.php
theme/base/style/core.css
theme/base/style/course.css