[Pkg-voip-commits] [twinkle] 01/02: Merge tag 'upstream/1.10.0+dfsg'

[Peter Colberg]

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

pc-guest pushed a commit to branch master
in repository twinkle.

commit 22a2f1f71e17a7b2365b093d23deaa40d7f977b9
Merge: 9fb1a32 18d2eeb
Author: Peter Colberg <peter at colberg.org>
Date:   Fri Jul 15 23:56:46 2016 -0400

    Merge tag 'upstream/1.10.0+dfsg'
    
    Upstream version 1.10.0+dfsg

 CMakeLists.txt |  4 ++--
 NEWS           | 11 +++++++++++
 data/twinkle.1 |  4 ++--
 3 files changed, 15 insertions(+), 4 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/twinkle.git