Merge branch 'MDL-59751-master-v2' of git://github.com/lameze/moodle
authorJun Pataleta <jun@moodle.com>
Thu, 5 Oct 2017 06:53:31 +0000 (14:53 +0800)
committerJun Pataleta <jun@moodle.com>
Thu, 5 Oct 2017 06:53:31 +0000 (14:53 +0800)
1  2 
calendar/externallib.php
calendar/lib.php

Simple merge
Simple merge