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)
1  2 
calendar/lib.php

Simple merge