Merge branch 'MDL-49324-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 24 Feb 2016 06:55:51 +0000 (07:55 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 24 Feb 2016 06:55:51 +0000 (07:55 +0100)

Trivial merge