Merge branch 'MDL-32881-master-2' of git://git.luns.net.uk/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 14 May 2012 01:30:16 +0000 (13:30 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 14 May 2012 01:30:16 +0000 (13:30 +1200)
commit8ec7c2cfd98c55d9733ee8929148e199fa7b54ba
tree06ecc70f125cff46469e0ebdea0389efa135ecdb
parentc96e613c66b00fc7e3bd31e2a5430a9e9145afdf
parent3aaa1843999eeb1832331ec5c8b30865fdba9710
Merge branch 'MDL-32881-master-2' of git://git.luns.net.uk/moodle
course/lib.php