Merge branch 'MDL-30444' of git://github.com/kiklop74/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 29 Nov 2011 15:39:22 +0000 (16:39 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 29 Nov 2011 15:39:22 +0000 (16:39 +0100)

Trivial merge