Merge branch 'MDL-34894_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 1 Oct 2012 09:08:14 +0000 (11:08 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 1 Oct 2012 09:08:14 +0000 (11:08 +0200)

Trivial merge