Merge with master

This commit is contained in:
jygaulier
2012-03-07 11:22:08 +01:00
157 changed files with 2915 additions and 1509 deletions

View File

@@ -638,4 +638,4 @@ class task_Scheduler
$this->log("Scheduler2 has quit.\n");
}
}
}