Merge branch 'MDL-26047' of git://github.com/ptrkmkl/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 28 Feb 2011 11:27:46 +0000 (12:27 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 28 Feb 2011 11:27:46 +0000 (12:27 +0100)

Trivial merge