Merge branch 'MDL-37566-m23' of git://github.com/andrewnicols/moodle into MOODLE_23_S...
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 5 Feb 2013 00:14:27 +0000 (01:14 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 5 Feb 2013 00:14:27 +0000 (01:14 +0100)

Trivial merge