Merge branch 'MDL-49732_master' of https://github.com/jinhofer/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 7 Jul 2015 17:18:19 +0000 (19:18 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 7 Jul 2015 17:18:19 +0000 (19:18 +0200)

Trivial merge