-
Committer:
Bazaar Package Importer
-
Author(s):
Barry Warsaw
-
Date:
2011-10-19 10:13:01 UTC
-
Revision ID:
james.westby@ubuntu.com-20111019101301-ivpog73ckq6fgtax
Tags: 1.3.1-1ubuntu1
* Merge with Debian. Remaining changes:
- 09_test_view_decorator_sleep.diff increases the sleep time to
reduce race condition effects on build machines.
https://code.djangoproject.com/ticket/16686 (LP: #829487)