Merge branch 'MDL-49329-master-multiplug' of git://github.com/mudrd8mz/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 19 Oct 2015 16:10:40 +0000 (18:10 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 19 Oct 2015 16:10:40 +0000 (18:10 +0200)

Trivial merge