Merge branch 'MDL-48795' of https://github.com/apsdehal/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 24 Mar 2015 14:44:37 +0000 (15:44 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 24 Mar 2015 14:44:37 +0000 (15:44 +0100)

Trivial merge