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

Trivial merge