Merge branch 'MDL-30731-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 20 Nov 2012 07:31:27 +0000 (15:31 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 20 Nov 2012 07:31:27 +0000 (15:31 +0800)
commitf132526512413bf91de0d07bf8cd233f50011a1c
treeefabde9870d2ab0a736948220f41ea7f0a652f4e
parent3d51f11c9af34899bc6dd7a523bde4bf90969944
parentf19d57e5142deec43c4d0c4e91bb9cd8b7038cf6
Merge branch 'MDL-30731-master' of git://github.com/FMCorz/moodle
calendar/lib.php