Merge branch 'MDL-31058' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Sun, 22 Jan 2012 23:56:08 +0000 (00:56 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Sun, 22 Jan 2012 23:56:08 +0000 (00:56 +0100)

Trivial merge