[Python-modules-commits] [sip4] 04/04: Merge local changes.

[Scott Kitterman]

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

kitterman pushed a commit to branch master
in repository sip4.

commit 9d921555bebb64ab8d529137cb3d7b971b0704e5
Merge: 79b779a 9163985
Author: Scott Kitterman <scott at kitterman.com>
Date:   Fri Apr 15 18:44:19 2016 -0400

    Merge local changes.

 debian/changelog | 4 ++++
 debian/control   | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --cc debian/changelog
index 30eb2e4,70e30de..a5b5639
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,8 +1,12 @@@
 -sip4 (4.17+dfsg-3) UNRELEASED; urgency=medium
 +sip4 (4.18+dfsg-1) UNRELEASED; urgency=medium
  
++  [ Scott Kitterman ]
 +  * New upstream release
 +
++  [ Ondřej Novy ]
+   * Fixed VCS URL (https)
+ 
 - -- Ondřej Nový <novy at ondrej.org>  Tue, 29 Mar 2016 22:32:05 +0200
 + -- Scott Kitterman <scott at kitterman.com>  Fri, 15 Apr 2016 18:37:14 -0400
  
  sip4 (4.17+dfsg-2) unstable; urgency=medium
  

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