Merge branch 'MDL-40533-master' of git://github.com/FMCorz/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 20 Jan 2014 23:17:31 +0000 (00:17 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 20 Jan 2014 23:17:31 +0000 (00:17 +0100)

Trivial merge