Merge branch 'MDL-46078-master' of git://github.com/damyon/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 18 Aug 2015 22:59:42 +0000 (00:59 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 19 Aug 2015 16:30:36 +0000 (18:30 +0200)

Trivial merge