-
Committer:
Bazaar Package Importer
-
Author(s):
Matthias Klose
-
Date:
2010-11-17 14:36:04 UTC
-
mfrom:
(3.2.2 sid)
-
Revision ID:
james.westby@ubuntu.com-20101117143604-o14s4i5mg3sr0s0v
Tags: 1.3.05-1ubuntu1
* Merge with Debian, remaining changes:
- Adjust versioned conflict with libxalan2-java.