Merge branch 'MDL-51623_parent_event' of git://github.com/moodlerooms/moodle
authorDavid Monllao <davidm@moodle.com>
Thu, 8 Oct 2015 07:53:00 +0000 (15:53 +0800)
committerDavid Monllao <davidm@moodle.com>
Thu, 8 Oct 2015 07:53:00 +0000 (15:53 +0800)
commit02c85f99342f6d0909f82acf45dee1ee628135d7
treeeb4f12df20c9320b18ad2822ad43d18f0f42af74
parenta7d95e4e654e210a662b6bfa12916d105919415b
parent2df73956b805a6f1f40361ed4e31b9011288c244
Merge branch 'MDL-51623_parent_event' of git://github.com/moodlerooms/moodle