[Python-modules-commits] [ujson] 07/11: Merge branch 'master' of git+ssh://git.debian.org/git/python-modules/packages/ujson

[Sandro Tosi]

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

morph pushed a commit to branch master
in repository ujson.

commit 1c3748937c9acfb6f242ff89b4d406c6b9fd4120
Merge: fb64beb 93c9548
Author: Sandro Tosi <morph at debian.org>
Date:   Tue Jun 14 18:17:42 2016 +0100

    Merge branch 'master' of git+ssh://git.debian.org/git/python-modules/packages/ujson

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

diff --cc debian/changelog
index 377c283,578d2e9..5d57782
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,5 -1,6 +1,6 @@@
 -ujson (1.34-1) UNRELEASED; urgency=medium
 +ujson (1.35-1) UNRELEASED; urgency=medium
  
+   [ Sandro Tosi ]
    * New upstream release
    * debian/control
      - set Vcs-* fields

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