Merge branch 'MDL-38487_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE
commitec00601863135b9936925946359e63bc7a630420
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 8 May 2013 22:54:54 +0000 (9 00:54 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 8 May 2013 22:54:54 +0000 (9 00:54 +0200)
tree2ee61288ba5afd2643b7f02ec84e6deb4118fc8d
parent781383a9467ecf65e99a95576229660542f25bce
parentc1288cd726293131093e6d2f34bb741970216f22
Merge branch 'MDL-38487_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE