Merge branch '21724-29' of git://github.com/samhemelryk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 3 Dec 2014 01:22:51 +0000 (02:22 +0100)
committerDan Poltawski <dan@moodle.com>
Thu, 4 Dec 2014 12:14:29 +0000 (12:14 +0000)
commit8b9bb799f9745fddebc8f34cc69e2951d8c6a6d8
tree5f29846b892551996e46586eaefb74f5ae3e97ff
parentfca0b79d185ac50a0aeb7ef6ce6684b88b8a463b
parent24d0d813e9b6be627421e36b8aa18b8d77fa114a
Merge branch '21724-29' of git://github.com/samhemelryk/moodle
lang/en/moodle.php