Merge branch 'wip-MDL-30997-master' of git://github.com/abgreeve/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 22 Feb 2012 12:09:54 +0000 (13:09 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 22 Feb 2012 12:09:54 +0000 (13:09 +0100)

Trivial merge