Merge branch 'MDL-39932_24' of git://github.com/grabs/moodle into MOODLE_24_STABLE
commite4c30d9639d0d3a4d4560a60574fc064cfe4ad2d
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 3 Jun 2013 17:10:55 +0000 (3 19:10 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 3 Jun 2013 17:10:55 +0000 (3 19:10 +0200)
treed2b3f8319e3829ddb894eab5c0ebf27ea7e48060
parent954e3847838d37cd66ef47bb27d2603acbde893e
parenta33fc4907eda4512680a896907621d0d5d981db9
Merge branch 'MDL-39932_24' of git://github.com/grabs/moodle into MOODLE_24_STABLE