Merge branch 'MDL-38230' of git://github.com/jmvedrine/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 5 Aug 2015 10:38:51 +0000 (12:38 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 5 Aug 2015 10:38:51 +0000 (12:38 +0200)

Trivial merge