Merge branch 'wip-MDL-37545-m25' of git://github.com/samhemelryk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 28 Jan 2013 18:23:17 +0000 (19:23 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 28 Jan 2013 18:23:17 +0000 (19:23 +0100)

Trivial merge