Merge branch 'MDL-29719-master' of git://github.com/sammarshallou/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 17 Oct 2011 10:05:05 +0000 (12:05 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 17 Oct 2011 10:05:05 +0000 (12:05 +0200)
1  2 
lang/en/admin.php

Simple merge