Merge branch 'w51_MDL-30605_m23_env23' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 14 Dec 2011 01:37:04 +0000 (02:37 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 14 Dec 2011 01:37:04 +0000 (02:37 +0100)

Trivial merge