Merge branch 'w03_MDL-31165_m23_innodbconv' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 16 Jan 2012 01:06:27 +0000 (02:06 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 16 Jan 2012 01:06:27 +0000 (02:06 +0100)

Trivial merge