Merge branch 'MDL-26594' of git://github.com/nebgor/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Sun, 13 Mar 2011 23:54:36 +0000 (00:54 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Sun, 13 Mar 2011 23:54:36 +0000 (00:54 +0100)

Trivial merge