Merge branch 'MDL-48973' of https://github.com/pauln/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 17 Feb 2015 22:51:01 +0000 (23:51 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 17 Feb 2015 22:51:01 +0000 (23:51 +0100)

Trivial merge