Merge branch 'wip-MDL-38422_M23' of git://github.com/gjb2048/moodle into MOODLE_23_STABLE
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Mar 2013 20:13:22 +0000 (21:13 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Mar 2013 20:13:22 +0000 (21:13 +0100)

Trivial merge