Merge branch 'wip-MDL-38165-m25' of git://github.com/samhemelryk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Sun, 3 Mar 2013 22:07:05 +0000 (23:07 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Sun, 3 Mar 2013 22:08:15 +0000 (23:08 +0100)

Trivial merge