Merge branch 'MDL-50187_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 12 May 2015 07:48:28 +0000 (09:48 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 12 May 2015 07:48:28 +0000 (09:48 +0200)

Trivial merge