-
Committer:
Bazaar Package Importer
-
Author(s):
Jamie Strandboge
-
Date:
2011-02-17 13:34:07 UTC
-
mfrom:
(1.1.13 upstream)
(4.4.12 sid)
-
Revision ID:
james.westby@ubuntu.com-20110217133407-rwr88elhhq6j7ba0
Tags: 1.2.5-1ubuntu1
* Merge from Debian for security fixes (LP: #719031). Remaining changes:
- debian/control: don't Build-Depends on locales-all, which doesn't exist
in natty
* Drop the following patches, now included upstream:
- debian/patches/07_security_admin_infoleak.diff
- debian/patches/08_security_pasword_reset_dos.diff