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