Merge branch 'MDL-28643-master' of git://github.com/sammarshallou/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 16 Aug 2011 22:44:44 +0000 (00:44 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 16 Aug 2011 22:44:44 +0000 (00:44 +0200)

Trivial merge