Merge branch 'master' of ssh://db.debian.org/git/userdir-ldap
authorPeter Palfrader <peter@palfrader.org>
Wed, 9 Sep 2009 17:21:30 +0000 (19:21 +0200)
committerPeter Palfrader <peter@palfrader.org>
Wed, 9 Sep 2009 17:21:30 +0000 (19:21 +0200)
commit5a150617472b541f4ff84e9bd55d702afe60ca39
tree30e89d27c940abc58866194df38ed36f80b40c7b
parent46be797703adf5f2ad080b053ab24511cde688e7
parent15a4da25cda1e33ccc1d951dc21f24380c6a2239
Merge branch 'master' of ssh://db.debian.org/git/userdir-ldap

* 'master' of ssh://db.debian.org/git/userdir-ldap:
  Add debian-maintainers.gpg to keyrings and sync_keyrings.
  cast objects to strings (rt #1717)

Conflicts:

debian/changelog
debian/changelog
ud-useradd