Merge branch 'MDL-34941' of https://github.com/mouneyrac/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 21 Aug 2012 00:42:33 +0000 (02:42 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 21 Aug 2012 00:42:33 +0000 (02:42 +0200)

Trivial merge