Merge branch 'w26_MDL-40254_m25_flatfile' of https://github.com/skodak/moodle into...
commit3d4a0f28875a3094c1e032fcd9c820c6bb677da0
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 24 Jun 2013 19:13:06 +0000 (24 21:13 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 24 Jun 2013 19:13:06 +0000 (24 21:13 +0200)
tree445b9a837c7b70c2907acc5e7ed720c010f2958c
parent9067595bf315d3b7887ba890817d73d2ead0cdb8
parent55384d2016051a743d1c2a84575f178546b02b0c
Merge branch 'w26_MDL-40254_m25_flatfile' of https://github.com/skodak/moodle into MOODLE_25_STABLE