Merge branch 'MDL-37577_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 21 Jan 2013 19:01:56 +0000 (20:01 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 21 Jan 2013 19:01:56 +0000 (20:01 +0100)

Trivial merge