Merge branch 'w06_MDL-26219_20_upgradelog' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 7 Feb 2011 19:22:29 +0000 (20:22 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 7 Feb 2011 19:22:29 +0000 (20:22 +0100)

Trivial merge