Merge branch 'MDL-45978_master' of git://github.com/grabs/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 17 Jun 2014 09:54:33 +0000 (11:54 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 17 Jun 2014 09:54:33 +0000 (11:54 +0200)

Trivial merge