Merge branch 'MDL-26190' of git://github.com/srynot4sale/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 7 Mar 2011 01:58:09 +0000 (02:58 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 7 Mar 2011 01:58:09 +0000 (02:58 +0100)

Trivial merge