Merge branch 'MDL-28028' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 29 Jun 2011 18:58:27 +0000 (20:58 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 29 Jun 2011 18:58:27 +0000 (20:58 +0200)

Trivial merge