Merge branch 'wip-MDL-37356-master' of git://github.com/abgreeve/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 26 Feb 2013 17:12:15 +0000 (18:12 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 26 Feb 2013 17:12:15 +0000 (18:12 +0100)

Trivial merge