[Python-modules-commits] [python-gammu] 02/04: Merge tag 'upstream/2.5'

[Michal Cihar]

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

nijel pushed a commit to branch master
in repository python-gammu.

commit 2cf4d8473fa11c2c49aecda603860c31cb03f074
Merge: 80a98e9 5198f12
Author: Michal Čihař <michal at cihar.com>
Date:   Tue Jan 19 15:33:29 2016 +0100

    Merge tag 'upstream/2.5'
    
    Upstream version 2.5
    
    # gpg: Podpis vytvořen Út 19. leden 2016, 15:33:29 CET pomocí klíče DSA s ID uživatele 36E75604
    # gpg: Dobrý podpis od "Michal Čihař <michal at cihar.com>"
    # gpg:                 alias "Michal Čihař <cihar at email.cz>"
    # gpg:                 alias "Michal Čihař <nijel at users.sourceforge.net>"
    # gpg:                 alias "Michal Čihař <nijel at debian.org>"

 NEWS.rst                                |   5 ++
 PKG-INFO                                |   4 +-
 README.rst                              |   2 +-
 examples/sendlongsms.py                 |   2 +-
 examples/service_numbers.py             |  19 ++++++-
 gammu/src/gammu.c                       |  91 ++++++++++++++++++++++++++------
 gammu/src/smsd.c                        |   3 ++
 python_gammu.egg-info/PKG-INFO          |   4 +-
 python_gammu.egg-info/SOURCES.txt       |   4 +-
 setup.py                                |   2 +-
 test/data/.sqlite.sql.swp               | Bin 0 -> 16384 bytes
 test/data/{sqlite.sql => sqlite-14.sql} |   0
 test/data/{sqlite.sql => sqlite-15.sql} |   3 +-
 test/test_dummy.py                      |   9 +++-
 test/test_smsd.py                       |  25 ++++++++-
 15 files changed, 141 insertions(+), 32 deletions(-)

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