Merge branch 'MDL-50583_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 22 Jun 2015 16:57:35 +0000 (18:57 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 22 Jun 2015 16:57:35 +0000 (18:57 +0200)

Trivial merge