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

Trivial merge