Merge branch 'MDL-30126' of git://github.com/mouneyrac/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 14 Feb 2012 12:12:07 +0000 (13:12 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 14 Feb 2012 12:12:07 +0000 (13:12 +0100)

Trivial merge