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

Trivial merge