Merge branch 'MDL-28557' of git://github.com/bostelm/moodle
authorDan Poltawski <dan@moodle.com>
Fri, 25 May 2012 03:07:14 +0000 (11:07 +0800)
committerDan Poltawski <dan@moodle.com>
Fri, 25 May 2012 03:07:14 +0000 (11:07 +0800)
1  2 
calendar/lib.php

Simple merge