Merge branch 'MDL-54644-master' of git://github.com/merrill-oakland/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 19 May 2016 16:57:04 +0000 (18:57 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 19 May 2016 16:57:04 +0000 (18:57 +0200)

Trivial merge