[med-svn] [python-freecontact] 09/10: Merge tag 'upstream/1.1'

[Laszlo Kajan]

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

lkajan pushed a commit to branch master
in repository python-freecontact.

commit c05fede0e155c754559c671db6204aebf234de4f
Merge: b2b5ddd 7df0af8
Author: Laszlo Kajan <lkajan at debian.org>
Date:   Thu Sep 19 19:24:19 2013 +0200

    Merge tag 'upstream/1.1'
    
    Upstream version 1.1
    
    Conflicts:
    	test/test01.py

 Changes             |    4 ++++
 PKG-INFO            |    2 +-
 setup.py            |    2 +-
 src/freecontact.cpp |    2 +-
 test/test01.py      |   19 ++++++++++---------
 5 files changed, 17 insertions(+), 12 deletions(-)

-- 
Alioth's /git/debian-med/git-commit-notice on /srv/git.debian.org/git/debian-med/python-freecontact.git