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

Simple merge