Merge branch 'MDL-26365' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 Feb 2011 00:03:23 +0000 (01:03 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 Feb 2011 00:03:23 +0000 (01:03 +0100)

Trivial merge