Merge branch 'w31_MDL-28533_m22_columnperf' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 9 Aug 2011 17:30:54 +0000 (19:30 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 9 Aug 2011 17:30:54 +0000 (19:30 +0200)

Trivial merge