Federico Hernandez a3242f7b5b 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

2012-09-18 22:58:59 +02:00

..

.gitignore

CMake

2011-01-05 22:46:25 +01:00

task-color.5.in

Version number and release date for 2.1.2

2012-09-18 21:07:43 +02:00

task-faq.5.in

Version number and release date for 2.1.2

2012-09-18 21:07:43 +02:00

task-sync.5.in

Version number and release date for 2.1.2

2012-09-18 21:07:43 +02:00

task-tutorial.5.in

Version number and release date for 2.1.2

2012-09-18 21:07:43 +02:00

task.1.in

Merge branch 'master' into 2.2.0

2012-09-18 22:58:59 +02:00

taskrc.5.in

Merge branch 'master' into 2.2.0

2012-09-18 22:58:59 +02:00