Merge branch 'w06_MDL-26290_20_mysqlport' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 7 Feb 2011 20:56:07 +0000 (21:56 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 7 Feb 2011 20:56:07 +0000 (21:56 +0100)

Trivial merge