Merge branch 'MDL-43590-en_fix' of git://github.com/mudrd8mz/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 10 Jan 2014 09:08:34 +0000 (10:08 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 10 Jan 2014 09:08:34 +0000 (10:08 +0100)
commit577432283cd28b805a2c7b819452a045a578adf2
tree7f21fc876003b1fdf74aef424bbaeba6cc91ab73
parent8a0667a9947bc485ae6c75858f90e4ce3c844a53
parent480fca77b3bf77bc0fe62aeea3f9c7b3ab6a9ec2
Merge branch 'MDL-43590-en_fix' of git://github.com/mudrd8mz/moodle
lang/en/admin.php
lang/en/badges.php
mod/assign/lang/en/assign.php
mod/folder/lang/en/folder.php
mod/lesson/lang/en/lesson.php