Merge branch 'MDL-55956-master-5' of git://github.com/junpataleta/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 8 Mar 2017 08:32:33 +0000 (16:32 +0800)
committerDan Poltawski <dan@moodle.com>
Fri, 10 Mar 2017 18:04:46 +0000 (18:04 +0000)
1  2 
calendar/lib.php

Simple merge