Merge branch 'MDL-42004-master' of git://github.com/FMCorz/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 1 Oct 2013 17:43:42 +0000 (19:43 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 1 Oct 2013 17:43:42 +0000 (19:43 +0200)

Trivial merge