comparison libpurple/protocols/jabber/disco.c @ 20685:02df6998b466

propagate from branch 'im.pidgin.rlaager.merging.2_2_1_conflicts' (head 4ad1081695d083df424898e6e7091f731b401265) to branch 'im.pidgin.pidgin' (head d33243e8f5347776c81f81a0e4ba3a76ae5505a5)
author Richard Laager <rlaager@wiktel.com>
date Fri, 28 Sep 2007 16:34:43 +0000
parents 481749fc0b6b
children a4b6854737d5
comparison
equal deleted inserted replaced
20258:509ca8ebe515 20685:02df6998b466