Merge branch 'MDL-30888-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 29 May 2012 07:12:38 +0000 (15:12 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 29 May 2012 07:12:38 +0000 (15:12 +0800)
1  2 
calendar/lib.php

Simple merge