Merge branch 'MDL-43140_master' of https://github.com/markn86/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Dec 2013 22:24:22 +0000 (23:24 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Dec 2013 22:24:22 +0000 (23:24 +0100)

Trivial merge