Merge branch 'wip-MDL-26348-m24' of git://github.com/samhemelryk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 8 Oct 2012 23:38:01 +0000 (01:38 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 8 Oct 2012 23:38:01 +0000 (01:38 +0200)

Trivial merge