Merge branch 'MDL-41568-en_fix' of git://github.com/mudrd8mz/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Sep 2013 13:12:19 +0000 (15:12 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Sep 2013 13:12:19 +0000 (15:12 +0200)
1  2 
lang/en/error.php

Simple merge