Merge branch 'MDL-50515' of git://github.com/jmvedrine/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 3 Aug 2015 23:21:16 +0000 (01:21 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 3 Aug 2015 23:21:16 +0000 (01:21 +0200)

Trivial merge