Merge branch 'MDL-49743-master' of git://github.com/danpoltawski/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 22 Dec 2015 16:13:51 +0000 (17:13 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 22 Dec 2015 16:14:38 +0000 (17:14 +0100)

Trivial merge