Merge branch 'MDL-51829-master' of git://github.com/dpalou/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 2 Nov 2015 18:40:16 +0000 (19:40 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 2 Nov 2015 18:40:16 +0000 (19:40 +0100)

Trivial merge