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)

Trivial merge