Merge branch 'wip-MDL-43135' of https://github.com/jennymgray/moodle
commit1c432ae6e1f1c0eacd19349f51acd29976272fee
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 10 Dec 2013 18:43:33 +0000 (10 19:43 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 10 Dec 2013 18:43:33 +0000 (10 19:43 +0100)
tree23a53b9355752d4d11ad54cc1384f4455910fa28
parent8f3e0bf7a5ae85a78e9efe632b908733bcc6a2f7
parenta080716fa6f4ae7bcac7220a2c9f1232827a461a
Merge branch 'wip-MDL-43135' of https://github.com/jennymgray/moodle
lang/en/moodle.php