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)
commit05d80ae6cd22975c9601d367d1795692b96a3a0e
treeb1b0360d0709fb467bd5c0eb603110935a31f34a
parent0ed8a933d626d1b45cbd96e2cd585f2194ecffc8
parent6534a90b2c9bdb7a0c697f6ddcd53af4d4c11ba2
Merge branch 'MDL-30888-master' of git://github.com/FMCorz/moodle
calendar/lib.php