Merge branch 'MDL-32566_master' of git://github.com/kordan/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 25 Apr 2012 00:05:09 +0000 (02:05 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 25 Apr 2012 00:05:09 +0000 (02:05 +0200)

Trivial merge