Merge branch 'MDL-37456' of git://github.com/danpoltawski/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 14 Jan 2013 22:32:39 +0000 (23:32 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 14 Jan 2013 22:32:39 +0000 (23:32 +0100)
1  2 
lang/en/admin.php

Simple merge