Merge branch 'mdl41996-master' of https://github.com/tlock/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 1 Oct 2013 18:01:33 +0000 (20:01 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 1 Oct 2013 18:01:33 +0000 (20:01 +0200)

Trivial merge