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

Trivial merge