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)
commit988a031a610bab3c271e9ea4a9e1f4ce038c4550
tree5c9d455f409a2f50a505a64ca5f37f0f9501026e
parent7737744d1b9c9c0c21edaed0049f79132364ba5d
parentef36d240c1168b8b20dea10793d23c2ab9f8fd02
Merge branch 'MDL-54996_m33v1' of https://github.com/sbourget/moodle
calendar/lib.php