Merge branch 'MDL-54996_m33v1' of https://github.com/sbourget/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 20 Dec 2016 09:19:23 +0000 (09:19 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 20 Dec 2016 09:19:23 +0000 (09:19 +0000)
1  2 
calendar/lib.php

Simple merge