diff libpurple/protocols/oscar/oscar.c @ 20726:2bb82b05d30a

merge of '07d5798f8a0b64518b4697e0376f5ceeddbb61e2' and 'da7520dee75fbe063aa7747c5452551d0030abee'
author Will Thompson <will.thompson@collabora.co.uk>
date Sun, 30 Sep 2007 16:55:19 +0000
parents d579d77d4604 02df6998b466
children f3cfcbbac3d8 30194e6e5e54 fdefa5eb46e2 b8d98bc09656
line wrap: on
line diff