Merge branch 'MDL-44840-master' of git://github.com/lameze/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 5 Aug 2015 18:46:59 +0000 (20:46 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 5 Aug 2015 18:46:59 +0000 (20:46 +0200)

Trivial merge