Merge branch 'wip-MDL-27638-master' of git://github.com/samhemelryk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 8 Jun 2011 23:20:54 +0000 (01:20 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 8 Jun 2011 23:20:54 +0000 (01:20 +0200)

Trivial merge