Merge branch 'MDL-31196' of git://github.com/stronk7/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 16 Jan 2012 11:16:42 +0000 (12:16 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 16 Jan 2012 11:16:42 +0000 (12:16 +0100)

Trivial merge