Merge branch 'MDL-30854' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 31 Jan 2012 18:30:58 +0000 (19:30 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 31 Jan 2012 18:30:58 +0000 (19:30 +0100)

Trivial merge