Merge branch 'MDL-37967' of git://github.com/jmvedrine/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Feb 2013 23:32:19 +0000 (00:32 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Feb 2013 23:32:19 +0000 (00:32 +0100)

Trivial merge