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

Simple merge