Merge branch 'wip-MDL-26979-master' of git://github.com/samhemelryk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 15 Aug 2011 20:46:01 +0000 (22:46 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 15 Aug 2011 20:46:01 +0000 (22:46 +0200)

Trivial merge