Merge branch 'wip-MDL-37572-m25' of git://github.com/samhemelryk/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 5 Feb 2013 07:25:08 +0000 (15:25 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 5 Feb 2013 07:25:08 +0000 (15:25 +0800)
commit9cf44c32b5112459cf9c9f4d0728385f2c0a99fc
tree9734f4774719a0d40620fc12683e309acf447873
parent751f00a0bb093c198aead1e386a0788dcd16c3d6
parent4d26b7f6fa82cb4e645148e8f76640cf84ccdb47
Merge branch 'wip-MDL-37572-m25' of git://github.com/samhemelryk/moodle
course/lib.php
lang/en/moodle.php
lib/navigationlib.php