-
Committer:
Bazaar Package Importer
-
Author(s):
Matthias Klose
-
Date:
2010-01-31 20:41:23 UTC
-
mfrom:
(1.1.11 upstream)
-
Revision ID:
james.westby@ubuntu.com-20100131204123-vourxnj86g6up33x
Tags: 2.5.5-1ubuntu1
* Merge with Debian; remaining changes:
- Include the pregenerated documentation.
- Set priority of python2.5-minimal to required.
- Build python2.5-doc from the pregenerated documentation.
* Regenerate the included documentation.