Paul Beckingham dc52e096ba Merge branch 'master' into 1.8.0 ...

Conflicts:
	html/task.html

2009-05-28 11:36:21 -04:00

..

man1

Added new man page doc/man5/taskrc.5

2009-05-14 20:57:53 -04:00

man5

Merge branch 'master' into 1.8.0

2009-05-28 11:36:21 -04:00