Merge branch 'wip-MDL-35818-master' of git://github.com/phalacee/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 15 Jan 2013 22:03:39 +0000 (11:03 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 15 Jan 2013 22:03:39 +0000 (11:03 +1300)
commitec16ef1f8563210840f8c4279c6be9b96346c8ce
treeae5b6a6d622ee787f2cd59bc300b9ca789453202
parent00ba185d52922a6807677baabf851e3cea2bcca0
parentb4a7ce9e717d232a03d94a0c216f2be8163d0ef9
Merge branch 'wip-MDL-35818-master' of git://github.com/phalacee/moodle
course/lib.php