Merge branch 'wip-MDL-42310-master' of git://github.com/abgreeve/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 8 Jan 2014 00:32:28 +0000 (01:32 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 8 Jan 2014 00:32:28 +0000 (01:32 +0100)

Trivial merge