Merge branch 'MDL-31262_25' of git://github.com/timhunt/moodle into MOODLE_25_STABLE
commitaded9ff97249ba88a039437256291945e097e635
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 2 Apr 2014 01:23:50 +0000 (2 03:23 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 2 Apr 2014 01:23:50 +0000 (2 03:23 +0200)
treef916f30dbbd3b3172805d3dd47cb7bd9dc822a6e
parent1db4576ef7b0562c9205c62ab15a6f88f5947a30
parent8e32e83f0a62325c8dd56e57d904f11fbfeb2d1e
Merge branch 'MDL-31262_25' of git://github.com/timhunt/moodle into MOODLE_25_STABLE