Merge branch 'wip-MDL-27767-master' of git://github.com/samhemelryk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 14 Dec 2011 02:16:20 +0000 (03:16 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 14 Dec 2011 02:16:20 +0000 (03:16 +0100)

Trivial merge