Merge branch 'MDL-30484' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 31 Jan 2012 16:16:04 +0000 (17:16 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 31 Jan 2012 16:16:04 +0000 (17:16 +0100)

Trivial merge