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)
1  2 
lang/en/admin.php
lib/navigationlib.php

Simple merge
Simple merge