Merge branch 'MDL-49296_m29v3' of https://github.com/sbourget/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 17 Mar 2015 11:03:50 +0000 (12:03 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 17 Mar 2015 11:03:50 +0000 (12:03 +0100)

Trivial merge