Merge branch 'MDL-50169' of https://github.com/sk-unikent/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 May 2015 00:03:07 +0000 (02:03 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 May 2015 00:03:07 +0000 (02:03 +0200)

Trivial merge