Merge branch 'w12_MDL-36198_m25_yuireset' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 18 Mar 2013 22:56:34 +0000 (23:56 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 18 Mar 2013 22:56:34 +0000 (23:56 +0100)
commit03deed4f750db390f0b1156e942df126c9f737f4
tree24b134308ea6d27f7073d254b286a5e9d2e1e313
parent864ce820c451b5db52efcc614cab1c578efa6ebc
parent97dbc8f2b602088265c640e91847072d5b1cd322
Merge branch 'w12_MDL-36198_m25_yuireset' of git://github.com/skodak/moodle