Merge branch 'w50_MDL-30625_m23_adminorder' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 8 Dec 2011 23:11:01 +0000 (00:11 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 8 Dec 2011 23:11:01 +0000 (00:11 +0100)

Trivial merge