Merge branch 'MDL-28103' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 1 Jul 2011 20:17:16 +0000 (22:17 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 1 Jul 2011 20:17:16 +0000 (22:17 +0200)

Trivial merge