Merge branch 'MDL-50107-master' of git://github.com/jleyva/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 16 Jun 2015 22:16:18 +0000 (00:16 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 18 Jun 2015 05:13:40 +0000 (07:13 +0200)

Trivial merge