Merge branch 'MDL-47466-master' of https://github.com/tehanuyor/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 5 Nov 2014 16:24:14 +0000 (16:24 +0000)
committerDan Poltawski <dan@moodle.com>
Wed, 5 Nov 2014 16:24:14 +0000 (16:24 +0000)
commit62e965c9b8c6e7a0ec97a00bc39b93759b77a609
tree6ada775041c68f907525f0dc40b653206cfded85
parentc293eb004bc8a9d34ead52769b23b8c86110f936
parentc3f51a3c79b81e87f8cb1050a07190107017eb70
Merge branch 'MDL-47466-master' of https://github.com/tehanuyor/moodle
calendar/lib.php