[lemonldap-ng] 02/02: Merge branch 'master' of git+ssh://git.debian.org/git/pkg-perl/packages/lemonldap-ng

[Xavier Guimard]

This is an automated email from the git hooks/post-receive script.

xguimard-guest pushed a commit to branch master
in repository lemonldap-ng.

commit 7d867556aacaef3aab6184eeb1f00b03181bb839
Merge: b3364ef e87d7cc
Author: Xavier Guimard <x.guimard at free.fr>
Date:   Mon Dec 4 17:21:02 2017 +0100

    Merge branch 'master' of git+ssh://git.debian.org/git/pkg-perl/packages/lemonldap-ng

 debian/changelog                          | 22 +++++++++++++++++++---
 debian/control                            | 14 +++-----------
 debian/patches/disable-captcha-test.patch | 15 ---------------
 debian/patches/javascript-typo.patch      | 20 ++++++++++++++++++++
 debian/patches/series                     |  2 +-
 debian/upstream/metadata                  | 10 +++++-----
 6 files changed, 48 insertions(+), 35 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/lemonldap-ng.git