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)
* '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


No differences found