Merge branch 'MDL-42816-master' of https://github.com/StudiUM/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 1 Apr 2014 23:52:41 +0000 (01:52 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 1 Apr 2014 23:52:41 +0000 (01:52 +0200)

Trivial merge