Merge branch 'wip-MDL-36341-m24' of git://github.com/samhemelryk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 6 Dec 2012 01:24:47 +0000 (02:24 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 6 Dec 2012 01:24:47 +0000 (02:24 +0100)

Trivial merge