Merge branch 'w41_MDL-42199_m26_rev' of https://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 8 Oct 2013 08:53:03 +0000 (10:53 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 8 Oct 2013 08:53:03 +0000 (10:53 +0200)
commit467fc039826a2b3d902517ec3839e73354453c1e
tree34e3d854099398f662d07693460204dfa35fac47
parent4f0eaf18f42a9ff8e11118b7f04195479ba10169
parent307124bed88ffccd5335c0bce9f5a29c6ae6c7ab
Merge branch 'w41_MDL-42199_m26_rev' of https://github.com/skodak/moodle