Merge branch 'MDL-48964' of git://github.com/jmvedrine/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 10 Feb 2015 00:09:38 +0000 (01:09 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 10 Feb 2015 00:09:38 +0000 (01:09 +0100)

Trivial merge