Merge branch 'MDL-45621_m29v3' of git://github.com/sbourget/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Mar 2015 09:54:30 +0000 (10:54 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Mar 2015 09:54:30 +0000 (10:54 +0100)

Trivial merge