merged 2.0 branch

2013-03-30 13:55:18 +00:00
parent 395cadfddf
commit 3b0b5a5c0b
55 changed files with 1510 additions and 21361 deletions
--- a/php/plugin.calendarimporter.php
+++ b/php/plugin.calendarimporter.php
@@ -48,7 +48,8 @@ class Plugincalendarimporter extends Plugin {
 						'calendarimporter' => Array(
 							'enable'        => PLUGIN_CALENDARIMPORTER_USER_DEFAULT_ENABLE,
 							'enable_export' => PLUGIN_CALENDARIMPORTER_USER_DEFAULT_ENABLE_EXPORT,
-							'default_calendar'	=> PLUGIN_CALENDARIMPORTER_DEFAULT
+							'default_calendar'	=> PLUGIN_CALENDARIMPORTER_DEFAULT,
+							'default_timezone' 	=> PLUGIN_CALENDARIMPORTER_DEFAULT_TIMEZONE
 						)
 					)
 				)