Merge branch 'MDL-30972_final' of git://github.com/nebgor/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 20 Feb 2012 10:20:21 +0000 (11:20 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 20 Feb 2012 10:20:21 +0000 (11:20 +0100)

Trivial merge