Merge branch 'MDL-31251' of git://github.com/nebgor/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 13 Feb 2012 22:37:34 +0000 (23:37 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 13 Feb 2012 22:37:34 +0000 (23:37 +0100)

Trivial merge