Thomas Bruederli 8d5bf112fa Fix merge conflict		2012-04-21 18:54:39 +02:00
..
default	Switched to official fullcalendar fork at github.com/roundcube/fullcalendar	2012-02-25 15:03:15 +01:00
larry	Fix merge conflict	2012-04-21 18:54:39 +02:00