Merge branch 'MDL-50176' of git://github.com/aolley/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 9 Jun 2015 18:28:36 +0000 (20:28 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 9 Jun 2015 18:28:36 +0000 (20:28 +0200)

Trivial merge