[lemonldap-ng] 02/02: Merge 1.3.1-1 and 1.3.0-1 because 1.3.0-1 was not published

[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 35357a936349dbd39c84abc8c1329860b267b85b
Author: Xavier Guimard <x.guimard at free.fr>
Date:   Sun Nov 24 19:30:31 2013 +0100

    Merge 1.3.1-1 and 1.3.0-1 because 1.3.0-1 was not published
---
 debian/changelog | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2288df4..3432ea2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,23 +3,15 @@ lemonldap-ng (1.3.1-1) unstable; urgency=low
   * Imported Upstream version 1.3.1
   * Update images copyrights
   * Add captcha directories management
-  * Remove "add-missings-args-to-prove" patch now included in upstream
-  * Bump Standards-Version to 3.9.5
-
- -- Xavier Guimard <x.guimard at free.fr>  Tue, 12 Nov 2013 06:16:20 +0100
-
-lemonldap-ng (1.3.0-1) unstable; urgency=low
-
-  * Imported Upstream version 1.3.0
   * Rename liblemonldap-ng-conf-perl to liblemonldap-ng-common-perl
   * Add libnet-facebook-oauth2-perl to recommended dependencies
   * Add libunicode-string-perl in dependencies
   * Rearrange dependencies as required in upstream
-  * Add Makefile patch to add missing libraries path for extra-tests
   * Update lintian overrides to add notifications directory
+  * Call "migrate" debconf arg only if a previous version exists
   * Bump Standards-Version to 3.9.5
 
- -- Xavier Guimard <x.guimard at free.fr>  Sun, 03 Nov 2013 22:07:09 +0100
+ -- Xavier Guimard <x.guimard at free.fr>  Sun, 24 Nov 2013 19:26:00 +0100
 
 lemonldap-ng (1.2.5-1) unstable; urgency=low
 

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