Merge branch 'MDL-35858-master' of git://github.com/FMCorz/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 12 Oct 2012 00:15:34 +0000 (02:15 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 12 Oct 2012 00:15:34 +0000 (02:15 +0200)

Trivial merge