Merge branch 'MDL-35794_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 7 Jan 2013 21:38:48 +0000 (22:38 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 7 Jan 2013 21:38:48 +0000 (22:38 +0100)

Trivial merge