Merge branch 'wip_master_mdl-38262' of git://github.com/iarenaza/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 11 Mar 2013 23:04:04 +0000 (00:04 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 11 Mar 2013 23:04:04 +0000 (00:04 +0100)

Trivial merge