Federico Hernandez f3d31834ee 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		2009-12-06 04:30:56 +01:00
..
task-tutorial.5	Bumped version number to 1.8.5	2009-11-18 10:22:33 +01:00
task.1	Feature - #336 prepend command	2009-12-04 22:47:44 -05:00
taskrc.5	Merge branch 'master' into 1.9.0	2009-12-06 04:30:56 +01:00