Merge branch 'master' into 1.9.0
due to release of 1.8.5 Conflicts: ChangeLog configure.ac doc/man/task-tutorial.5 doc/man/task.1 doc/man/taskrc.5 src/Config.cpp src/rules.cpp
This commit is contained in:
due to release of 1.8.5 Conflicts: ChangeLog configure.ac doc/man/task-tutorial.5 doc/man/task.1 doc/man/taskrc.5 src/Config.cpp src/rules.cpp