[Python-modules-commits] [python-django] 01/03: Merge branch 'debian/master' into debian/experimental

[Chris Lamb]

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

lamby pushed a commit to branch debian/experimental
in repository python-django.

commit 7631b4f7fc0e6b95fe7557f98efe5036905e9625
Merge: 12404f6 953dfbf
Author: Chris Lamb <lamby at debian.org>
Date:   Sun Jun 26 10:23:47 2016 +0200

    Merge branch 'debian/master' into debian/experimental
    
    * debian/master:
      releasing package python-django version 1:1.9.7-2
      Re-upload 1.9.7 to unstable with epoch.
      Add (accidental) upload to sid on the debian/master branch
    
    # Conflicts:
    #	debian/changelog

 debian/changelog | 6 ++++++
 1 file changed, 6 insertions(+)

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