Merge branch 'MDL-31065' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 23 Jan 2012 23:07:18 +0000 (00:07 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 23 Jan 2012 23:07:18 +0000 (00:07 +0100)

Trivial merge