Merge branch 'MDL-50781-master' of git://github.com/danpoltawski/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 10 Nov 2015 19:13:21 +0000 (20:13 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 10 Nov 2015 19:13:21 +0000 (20:13 +0100)

Trivial merge