Merge branch 'MDL-31100' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 16 Jan 2012 00:02:29 +0000 (01:02 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 16 Jan 2012 00:02:29 +0000 (01:02 +0100)

Trivial merge