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)
commit6628153eb348cef0afb298ba9ca2cea445265948
tree6805367eb012da7d046155a1a9fc9f87f5c32f94
parent641af8d17ce7478dd23c42af45a5a202498712c4
parenteeb27f03bdee03eda9eabc59f21b51732c3a6bb4
Merge branch 'MDL-58736-master' of git://github.com/cameron1729/moodle
calendar/lib.php