Merge branch 'wip-MDL-42020-master' of git://github.com/marinaglancy/moodle
commite077f21827c2c333ddd6bfd533dcccd4634965f8
authorDan Poltawski <dan@moodle.com>
Thu, 10 Oct 2013 00:18:28 +0000 (10 08:18 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 10 Oct 2013 00:18:28 +0000 (10 08:18 +0800)
tree1fe632b67e26556df40c0df00277fc2a8a3037a0
parent9c5d6183d599a18295f85b5bd81bfa44f354468e
parentbf1405a60ad2c4230f3023f66ba479ec5d588bb1
Merge branch 'wip-MDL-42020-master' of git://github.com/marinaglancy/moodle
lib/coursecatlib.php