Merge branch 'MDL-31562' of git://github.com/kiklop74/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 21 Feb 2012 01:28:14 +0000 (02:28 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 21 Feb 2012 01:28:14 +0000 (02:28 +0100)

Trivial merge