Merge branch 'MDL-30741_master' of git://github.com/jfilip/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 19 Dec 2011 22:59:33 +0000 (23:59 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 19 Dec 2011 22:59:33 +0000 (23:59 +0100)

Trivial merge