Merge branch 'MDL-28059' of git://git.luns.net.uk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 9 Aug 2011 23:58:03 +0000 (01:58 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 9 Aug 2011 23:58:03 +0000 (01:58 +0200)

Trivial merge