Merge branch 'MDL-45364-master' of git://github.com/danpoltawski/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 2 Dec 2015 01:35:53 +0000 (02:35 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 3 Dec 2015 10:16:33 +0000 (11:16 +0100)

Trivial merge