Merge branch 'hotfix/v0.11.2' into development

Conflicts: apps/documents/statistics.py docs/changelog.rst
2012-02-02 05:23:17 -04:00
parent 1c8fd9e212 c117a907e4
commit f8e2341f4f
5 changed files with 724 additions and 6 deletions
@@ -16,3 +16,4 @@ djangorestframework==0.2.3
 South==0.7.3
 python-gnupg==0.2.8
 python-hkp==0.1.3
+kombu==1.4.2