Merge branch 'MDL-51830-master' of git://github.com/lucisgit/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 1 Dec 2015 10:29:27 +0000 (18:29 +0800)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 3 Dec 2015 10:11:04 +0000 (11:11 +0100)
commit0ee52b8214eb70a546fb5d0fa7426bf2c8e99f1e
treeedaadac66f5fb3a684ee1b893180341c1ab588f1
parent3c2f70aeb6c6c09b654719012077e8001f25f0c8
parentfa29c0c3d41cc621a2072c3f8ad11819d5138c01
Merge branch 'MDL-51830-master' of git://github.com/lucisgit/moodle
lang/en/moodle.php