Merge branch '2.2.0' of tasktools.org:task into 2.2.0

This commit is contained in:
Federico Hernandez
2012-08-14 00:59:11 +02:00