[Python-modules-commits] [django-session-security] 07/07: Merge branch 'debian/sid' of ssh://anonscm.debian.org/git/python-modules/packages/django-session-security into debian/sid

[Jean-Michel Vourgère]

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

nirgal pushed a commit to branch debian/sid
in repository django-session-security.

commit fb05b3ddfe41da9c196116b661cf18f829d0e833
Merge: 75e6901 9a7964c
Author: Jean-Michel Vourgère <nirgal at debian.org>
Date:   Mon Apr 18 08:11:29 2016 +0200

    Merge branch 'debian/sid' of ssh://anonscm.debian.org/git/python-modules/packages/django-session-security into debian/sid
    
    Conflicts:
    	debian/changelog

 debian/changelog | 4 ++++
 debian/control   | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --cc debian/changelog
index a6c70ef,87ba924..570565b
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,15 +1,16 @@@
 -django-session-security (2.3.1+dfsg-2) UNRELEASED; urgency=medium
 +django-session-security (2.3.2+dfsg-1) unstable; urgency=medium
  
+   [ Jean-Michel Vourgère ]
 +  * New upstream version.
    * d/copyright: Fixed location of jquery that is embeded in source.
    * Uses jquery from libjs-jquery in binaries. Thanks lintian:
      - New d/*.links files.
      - New Recommends on package libjs-jquery.
  
+   [ Ondřej Nový ]
+   * Fixed VCS URL (https)
+ 
 - -- Jean-Michel Vourgère <nirgal at debian.org>  Sat, 30 Jan 2016 16:17:40 +0530
 + -- Jean-Michel Vourgère <nirgal at debian.org>  Mon, 18 Apr 2016 08:07:24 +0200
  
  django-session-security (2.3.1+dfsg-1) unstable; urgency=medium
  

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/django-session-security.git