Merge branch 'MDL-29511' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 3 Oct 2011 23:11:20 +0000 (01:11 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 3 Oct 2011 23:11:20 +0000 (01:11 +0200)

Trivial merge