comparison libpurple/protocols/yahoo/yahoo_aliases.c @ 20651:c1b559a2610f

merge of '31d62e1a78974a0239e86bfeb42b29ab75216114' and '9ac69ea809d7739080783dc7f3de14cfcf9325d3'
author Luke Schierer <lschiere@pidgin.im>
date Mon, 24 Sep 2007 12:14:42 +0000
parents b6a01d947a8a
children b93e7be3847b e3d22d8ba9f0
comparison
equal deleted inserted replaced
20634:275fe4d67158 20651:c1b559a2610f