Merge branch 'wip-MDL-41578-master' of git://github.com/marinaglancy/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 10 Sep 2013 21:00:54 +0000 (09:00 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 10 Sep 2013 21:00:54 +0000 (09:00 +1200)
1  2 
lib/coursecatlib.php

Simple merge