Merge branch 'w24_MDL-33204_m23_importsort' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 13 Jun 2012 16:01:31 +0000 (18:01 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 13 Jun 2012 16:01:31 +0000 (18:01 +0200)

Trivial merge