[Pkg-silc-commits] [SCM] plugin for Kopete to support SILC protocol branch, master, updated. debian/0.5-1

[Jérémy Bobbio]

The following commit has been merged in the master branch:
commit 6c759d2b5d09da050475c32a4fedb65c9834e0ca
Merge: 663be5576038e59f306260cc23207986fc687aac 5697dbeef99978837a783015bb527843c2a0aa64
Author: Jérémy Bobbio <lunar at debian.org>
Date:   Thu Jun 25 18:11:46 2009 +0200

    Merge commit 'upstream/0.5'
    
    Conflicts:
    	src/silcaccount.cpp
    	src/silcservercontact.cpp


-- 
plugin for Kopete to support SILC protocol