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)
1  2 
lang/en/moodle.php

Simple merge