Merge branch 'MDL-37686-master' of git://github.com/FMCorz/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 12 Feb 2013 00:16:48 +0000 (01:16 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 12 Feb 2013 00:16:48 +0000 (01:16 +0100)

Trivial merge