Merge branch 'MDL-50816-master' of git://github.com/jleyva/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 5 Aug 2015 16:20:52 +0000 (18:20 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 5 Aug 2015 16:20:52 +0000 (18:20 +0200)

Trivial merge