Merge branch 'MDL-35034-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 5 Sep 2012 23:18:40 +0000 (01:18 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 5 Sep 2012 23:18:40 +0000 (01:18 +0200)

Trivial merge