Merge branch 'MDL-26338' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 14 Feb 2011 18:57:38 +0000 (19:57 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 14 Feb 2011 18:57:38 +0000 (19:57 +0100)

Trivial merge