Merge branch 'MDL-38418-master' of git://github.com/FMCorz/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Mar 2013 22:15:04 +0000 (23:15 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Mar 2013 22:15:04 +0000 (23:15 +0100)

Trivial merge