Merge branch 'MDL-27989_master' of git://github.com/kordan/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 7 Jul 2011 00:19:15 +0000 (02:19 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 7 Jul 2011 00:19:15 +0000 (02:19 +0200)

Trivial merge