Merge branch 'wip_mdl-31968_mdl-23011_master' of https://github.com/iarenaza/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 8 Oct 2012 22:13:06 +0000 (00:13 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 8 Oct 2012 22:13:06 +0000 (00:13 +0200)

Trivial merge