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

Trivial merge