Merge branch 'wip-MDL-38055-m23' of git://github.com/samhemelryk/moodle into MOODLE_2...
commit35c4301b2c081364ec3148120e0c349130d63ee9
authorDamyon Wiese <damyon@moodle.com>
Tue, 16 Apr 2013 07:14:19 +0000 (16 15:14 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 16 Apr 2013 07:14:19 +0000 (16 15:14 +0800)
tree2ac52f759e403c2e2f7cec1ef28f240a722293ca
parent770e8c02dbf4dcef8d862a819a5bf4c6c5605d81
parent4688b27ab34ba6182522918eb997d7092003ae78
Merge branch 'wip-MDL-38055-m23' of git://github.com/samhemelryk/moodle into MOODLE_23_STABLE
course/lib.php
lib/navigationlib.php