Merge branch 'wip-MDL-33017-m24-r2' of git://github.com/samhemelryk/moodle
commit8f3020558d5fb8ece0ccc942dbdc6b8903cd055b
authorDan Poltawski <dan@moodle.com>
Wed, 7 Nov 2012 06:17:11 +0000 (7 14:17 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 7 Nov 2012 06:17:11 +0000 (7 14:17 +0800)
treeee8594ad895f16acfebce8b6a9c8a0f85ac5757a
parent1383b1f29af5ee7bb22e35ab9ea5ecfc69365012
parentb9c87ef86a6870e3d0f35414d0e9cdf827176455
Merge branch 'wip-MDL-33017-m24-r2' of git://github.com/samhemelryk/moodle
lang/en/moodle.php
lib/navigationlib.php