Merge branch 'MDL-49240-master' of git://github.com/damyon/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Mar 2015 00:11:16 +0000 (01:11 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Mar 2015 00:11:16 +0000 (01:11 +0100)

Trivial merge