Merge branch 'MDL-43332_master' of https://github.com/markn86/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 14 Jan 2014 15:48:22 +0000 (16:48 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 14 Jan 2014 15:48:22 +0000 (16:48 +0100)

Trivial merge