Merge branch 'MDL-51929-master' of git://github.com/dpalou/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 16 Feb 2016 10:22:53 +0000 (11:22 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 16 Feb 2016 10:22:53 +0000 (11:22 +0100)

Trivial merge