Merge branch '47428-28' of git://github.com/samhemelryk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 30 Sep 2014 21:42:58 +0000 (23:42 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 30 Sep 2014 21:42:58 +0000 (23:42 +0200)
1  2 
lang/en/plugin.php

Simple merge