Merge branch 'MDL-49882' of git://github.com/jmvedrine/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 9 Jun 2015 23:39:17 +0000 (01:39 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 9 Jun 2015 23:39:17 +0000 (01:39 +0200)

Trivial merge