Merge branch 'MDL-50207-master' of git://github.com/lameze/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 23 Sep 2015 18:05:10 +0000 (20:05 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 24 Sep 2015 13:38:19 +0000 (15:38 +0200)

Trivial merge