Merge branch 'MDL-45443-master' of git://github.com/FMCorz/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 8 May 2014 10:52:54 +0000 (12:52 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 8 May 2014 10:52:54 +0000 (12:52 +0200)

Trivial merge