Merge branch 'MDL-38397_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Mar 2013 11:29:01 +0000 (12:29 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Mar 2013 11:29:01 +0000 (12:29 +0100)

Trivial merge