Merge branch 'master_MDL-45726' of https://github.com/danmarsden/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Jun 2014 00:20:48 +0000 (02:20 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Jun 2014 00:20:48 +0000 (02:20 +0200)

Trivial merge