Merge branch 'master' into 2.2.0

- merge of 2.1.2 release being now the current released version in
  master.

Conflicts:
	CMakeLists.txt
	NEWS
	test/bug.1104.t
	test/run_all
This commit is contained in:
Federico Hernandez 2012-09-18 22:58:59 +02:00
commit a3242f7b5b
19 changed files with 175 additions and 79 deletions

View file

@ -1,4 +1,4 @@
.TH task 1 2012-07-24 "${PACKAGE_STRING}" "User Manuals"
.TH task 1 2012-09-18 "${PACKAGE_STRING}" "User Manuals"
.SH NAME
task \- A command line todo manager.