diff libpurple/protocols/bonjour/bonjour_ft.c @ 32253:9173ec5a45cf

merge of '1b285d0b375fbd5e778db6bb852a7b089feb16a3' and 'd1328041ee003fdee29a0cf6ae44b44727a49bb8'
author Kevin Stange <kevin@simguy.net>
date Sun, 02 Oct 2011 00:06:40 +0000
parents d2ef8926b960
children df7fb85b11ba
line wrap: on
line diff