Merge branch 'MDL-28185_master' of git://github.com/stronk7/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 5 Jul 2011 15:58:55 +0000 (17:58 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 5 Jul 2011 15:58:55 +0000 (17:58 +0200)

Trivial merge