Merge branch 'MDL-28219d' of git://github.com/bostelm/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Sun, 16 Oct 2011 19:16:38 +0000 (21:16 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Sun, 16 Oct 2011 19:16:38 +0000 (21:16 +0200)

Trivial merge