Merge branch 'patch-1' of https://github.com/jrchamp/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 22 Dec 2014 13:37:52 +0000 (13:37 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 22 Dec 2014 13:37:52 +0000 (13:37 +0000)
commitd61ecfffe5a568bf1e6cb7684264272413ff5766
treeeab41ada2cf2de72ca1cdd91c227c340d590a8db
parente04cf8d83fa0f392f9ce8ee50d94610b7073e73d
parentefa2b9b35c959ee86c8aa6d93505f0a735d7bd17
Merge branch 'patch-1' of https://github.com/jrchamp/moodle
calendar/lib.php