Merge branch 'MDL-35870' of git://github.com/nobelium/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 Jul 2014 16:30:29 +0000 (18:30 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 Jul 2014 16:30:29 +0000 (18:30 +0200)

Trivial merge