Merge branch 'MDL-41157-master' of git://github.com/danpoltawski/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 20 Aug 2013 22:48:02 +0000 (10:48 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 20 Aug 2013 22:48:02 +0000 (10:48 +1200)
commitead9cce340cb90536b21f5e0388c67400ea602f7
treefa3868581e72673b1f448c716cac0d5bc9cc4d0c
parentcc76e82d5862224e9f2b8fbb42b889a5292e470e
parentd20b0aa56737c41926d20894c7eb86bfef922226
Merge branch 'MDL-41157-master' of git://github.com/danpoltawski/moodle
calendar/lib.php