Merge branch 'MDL-38119_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 5 Mar 2013 15:46:05 +0000 (16:46 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 5 Mar 2013 15:46:05 +0000 (16:46 +0100)

Trivial merge