Merge branch 'MDL-32340-master-2' of git://git.luns.net.uk/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 14 May 2012 02:04:21 +0000 (14:04 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 14 May 2012 02:04:21 +0000 (14:04 +1200)
commit04d7103804545ea14f99ebfb590634b50eaec996
tree8fac90ce81bd3f377b12462b3616a2a4be55948a
parent924c34df8c50470a51a460abf4f75d30c5cddb48
parentd083084a236ca94f4237ad39d82e4481ac378016
Merge branch 'MDL-32340-master-2' of git://git.luns.net.uk/moodle
calendar/lib.php