Merge branch 'MDL-32657-master-1' of git://git.luns.net.uk/moodle
commit398e6932b0df5f3f9f729753d4454c6957c9f79b
authorSam Hemelryk <sam@moodle.com>
Wed, 2 May 2012 02:41:11 +0000 (2 14:41 +1200)
committerSam Hemelryk <sam@moodle.com>
Wed, 2 May 2012 02:41:11 +0000 (2 14:41 +1200)
tree991e94ca9406b5ccd0a54786d059d2cf139cfbd8
parentfe9693df87681b9f7a9bdb804f2dbe6cf89945ec
parentc77582fe4270136d21a37f9911a2b4e99635fdbc
Merge branch 'MDL-32657-master-1' of git://git.luns.net.uk/moodle
course/lib.php