Merge branch 'wip-MDL-40049-master-i' of git://github.com/abgreeve/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 1 Oct 2013 21:42:00 +0000 (23:42 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 1 Oct 2013 21:42:00 +0000 (23:42 +0200)

Trivial merge