Merge branch 'MDL-26643' of git://github.com/nebgor/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 14 Mar 2011 00:57:08 +0000 (01:57 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 14 Mar 2011 00:57:08 +0000 (01:57 +0100)

Trivial merge