Merge branch 'wip-MDL-37644-m25' of git://github.com/samhemelryk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 30 Jan 2013 09:27:11 +0000 (10:27 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 30 Jan 2013 09:27:11 +0000 (10:27 +0100)
commitf97db0197841ca20e15028eb6de3d25dc7f2e46b
treec39dd7635c44e15ddb033b42088bace403fe83a7
parent7543705d9bbed76bfec67475818a2a594e217493
parentd20337f180a716ce95a936c8ca0fb818b11590fe
Merge branch 'wip-MDL-37644-m25' of git://github.com/samhemelryk/moodle
lang/en/admin.php
lib/navigationlib.php