[Pkg-telepathy-commits] [SCM] farsight2 packaging branch, debian-patches, updated. upstream/0.0.11-2-g7ed90ef

[Laurent Bigonville]

The following commit has been merged in the debian-patches branch:
commit 7ed90ef6ad25ec82371a502e56831799b8051ed9
Merge: 1d44cf9142df5a760218c4b2279da3a9f4ad78ee 833773c23d2ee68923c147824d092c80ccb4f3d1
Author: Laurent Bigonville <bigon at bigon.be>
Date:   Tue May 26 11:46:54 2009 +0200

    Merge branch 'upstream' into debian-patches
    
    Conflicts:
    	gst/fsrtpconference/Makefile.am


-- 
farsight2 packaging