Merge branch 'MDL-54553-master' of git://github.com/danpoltawski/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 18 May 2016 16:23:41 +0000 (18:23 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 18 May 2016 16:23:41 +0000 (18:23 +0200)

Trivial merge