Merge branch 'MDL-49185-master' of git://github.com/lameze/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 7 Jul 2015 07:54:42 +0000 (09:54 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 7 Jul 2015 14:59:19 +0000 (16:59 +0200)

Trivial merge