Merge branch 'MDL-54643-master' of git://github.com/jleyva/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 19 May 2016 11:50:47 +0000 (13:50 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 19 May 2016 11:50:47 +0000 (13:50 +0200)

Trivial merge