Merge branch 'MDL-35436' of https://github.com/raymondAntonio/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 8 Oct 2012 22:36:00 +0000 (00:36 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 8 Oct 2012 22:36:00 +0000 (00:36 +0200)

Trivial merge