-
Committer:
Bazaar Package Importer
-
Author(s):
Paolo Sammicheli
-
Date:
2011-03-22 23:37:44 UTC
-
mfrom:
(1.1.5 upstream)
(9.1.2 sid)
-
Revision ID:
james.westby@ubuntu.com-20110322233744-d30asq1zohvnznay
Tags: 1.10.0-1ubuntu1
* Merge from debian unstable (LP: #777924). Remaining changes:
- debian/runtime.debian: replaced /etc/libnss-ldap.conf references by
/etc/ldap.conf, many thanks Ahmed El-Mahmoudy.