Merge branch 'MDL-28684b' of git://github.com/bostelm/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 23 Aug 2011 20:50:03 +0000 (22:50 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 23 Aug 2011 20:50:03 +0000 (22:50 +0200)

Trivial merge