merge changes with timeout change
[lantea.git] / .gitignore