Merge branch 'MDL-43401-master' of git://github.com/FMCorz/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 21 Jan 2014 00:46:16 +0000 (01:46 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 21 Jan 2014 00:46:16 +0000 (01:46 +0100)

Trivial merge