Merge branch 'wip-MDL-27405-m23' of git://github.com/samhemelryk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 13 Mar 2012 21:35:04 +0000 (22:35 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 13 Mar 2012 21:35:04 +0000 (22:35 +0100)
1  2 
lang/en/admin.php

Simple merge