Merge branch 'MDL-34756-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 20 Aug 2012 14:35:20 +0000 (16:35 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 20 Aug 2012 14:35:20 +0000 (16:35 +0200)

Trivial merge