Merge branch 'MDL-34810_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 20 Aug 2012 23:36:36 +0000 (01:36 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 20 Aug 2012 23:36:36 +0000 (01:36 +0200)

Trivial merge