Merge branch 'MDL-28100' of git://git.luns.net.uk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 6 Jul 2011 22:12:19 +0000 (00:12 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 6 Jul 2011 22:12:19 +0000 (00:12 +0200)

Trivial merge