Merge branch 'MDL-35027-B' of https://github.com/bostelm/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 4 Aug 2015 23:15:59 +0000 (01:15 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 4 Aug 2015 23:15:59 +0000 (01:15 +0200)

Trivial merge