Merge branch 'MDL-35644' of git://github.com/mouneyrac/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 1 Oct 2012 10:45:51 +0000 (12:45 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 1 Oct 2012 10:45:51 +0000 (12:45 +0200)

Trivial merge