Merge branch 'wip-MDL-36035-m25' of git://github.com/samhemelryk/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 15 Jan 2013 03:56:12 +0000 (11:56 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 15 Jan 2013 03:56:12 +0000 (11:56 +0800)
commitfb8585521a527fd8b76addf1a2aac7ca1ae7fd62
treef243cfe9e9ab50ef404eecd57d5da1fc2c47f0a0
parent4a489ba46544c9d46637c806756bf9ce8cd6623b
parentf1ac8520aef25791b8f6aeb76a15ff6e4553b119
Merge branch 'wip-MDL-36035-m25' of git://github.com/samhemelryk/moodle
course/lib.php