Merge branch 'apollo13/master' into 1point0

Conflicts:
	docs/configuration.rst
	docs/cookbook/tasks.rst

docs/configuration.rst

@@ -81,8 +81,6 @@ Task result backend settings
 .. _`Redis`: http://code.google.com/p/redis/
 .. _`Tokyo Tyrant`: http://1978th.net/tokyotyrant/
 
-
-
 Database backend settings
 =========================