Merge branch 'w24_MDL-33635_m23_sort' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 13 Jun 2012 14:40:07 +0000 (16:40 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 13 Jun 2012 14:40:07 +0000 (16:40 +0200)
commitf7b3e092e939d42acf89aa60c0066de144f50cef
treea94ef45a948ce81cf14cb5f209a6ee9203e0e562
parent5c2bbfd6e9685ec47b3fd41ec9a8c5f902a1d0f5
parentbc53b4e9d70bff702655ca4ac14fff31b6fce2f3
Merge branch 'w24_MDL-33635_m23_sort' of git://github.com/skodak/moodle