Merge branch 'wip-MDL-37612_master' of git://github.com/lazydaisy/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 28 Jan 2013 04:37:07 +0000 (17:37 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 28 Jan 2013 04:37:07 +0000 (17:37 +1300)
commit56a81ad8568ec159ae3f98d233f959f02ee98729
tree25643f213ddfa4c35aa8fd99d16a0bbed3afbd7c
parent58f828ca14142611643b355977e97e3d78deaf08
parenteb610eb90d1794a49d1c3c6440c9454e71d6ebd9
Merge branch 'wip-MDL-37612_master' of git://github.com/lazydaisy/moodle
course/category.php
course/lib.php