[Pkg-telepathy-commits] [SCM] Haze packaging branch, debian, updated. debian/0.3.5-1-5-g173e5b8

[Jonny Lamb]

The following commit has been merged in the debian branch:
commit 6347c77cad1273ecc2e73f5db5940bb8697e1829
Merge: da3768bd999c5272d55c9734b201942847ef628d 5be8a3e7b26371bcf0750eaac5c020872a1bc1bc
Author: Jonny Lamb <jonny at debian.org>
Date:   Mon Jul 19 12:28:03 2010 +0100

    Merge commit 'upstream/0.3.6' into debian
    
    Conflicts:
    	NEWS
    	configure
    	configure.ac
    	src/connection.c
    	tests/twisted/constants.py
    
    Signed-off-by: Jonny Lamb <jonny at debian.org>


-- 
Haze packaging