Merge branch 'MDL-25191-master' of git://github.com/sammarshallou/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 30 May 2011 22:58:34 +0000 (00:58 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 30 May 2011 22:58:34 +0000 (00:58 +0200)

Trivial merge