Merge branch 'MDL-58736-master' of git://github.com/cameron1729/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 4 May 2017 06:33:27 +0000 (14:33 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 4 May 2017 06:33:27 +0000 (14:33 +0800)
1  2 
calendar/lib.php

Simple merge