Merge branch 'MDL-36683_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 20 Nov 2012 00:33:49 +0000 (01:33 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 20 Nov 2012 00:33:49 +0000 (01:33 +0100)

Trivial merge