Merge branch 'master' into dbschedule

Conflicts:
	celery/conf.py

Author: Ask Solem

.gitignore

@@ -14,3 +14,4 @@ pip-log.txt
 erl_crash.dump
 *.db
 Documentation/
+.tox/

AUTHORS

@@ -29,3 +29,12 @@ Ordered by date of first contribution:
   Patrick Altman <[email protected]>
   Vincent Driessen <[email protected]>
   Hari <[email protected]>
+  Bartosz Ptaszynski
+  Marcin Lulek <[email protected]>
+  Honza Kral <[email protected]>
+  Jonas Haag <[email protected]>
+  Armin Ronacher <[email protected]>
+  Gunnlaugur Thor Briem <[email protected]>
+  Mikhail Gusarov <[email protected]>
+  Frédéric Junod <[email protected]>
+  Lukas Linhart <[email protected]>