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:
Federico Hernandez
2009-12-06 04:30:56 +01:00
24 changed files with 317 additions and 72 deletions

View File

@@ -42,3 +42,5 @@ Thanks to the following, who submitted detailed bug reports and excellent sugges
Zach Frazier
Ivo Jimenez
Joe Pulliam
Juergen Daubert