Merge OSCAR from 3.5 branch up to revision 600813.
commitb04f1cc9465d9e9cad3047e33eb52f4e2b88a222
authorrjarosz <rjarosz@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Tue, 31 Oct 2006 23:31:51 +0000 (31 23:31 +0000)
committerrjarosz <rjarosz@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Tue, 31 Oct 2006 23:31:51 +0000 (31 23:31 +0000)
treef204f999bd9ca5404aceb06a1c71566a35229446
parent60bcad9213d961d0e5c65d8c8aff27e5e88acda9
Merge OSCAR from 3.5 branch up to revision 600813.

git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/KDE/kdenetwork@600837 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
kopete/protocols/oscar/liboscar/client.cpp
kopete/protocols/oscar/liboscar/offlinemessagestask.cpp
kopete/protocols/oscar/liboscar/offlinemessagestask.h