comparison pidgin/gtkconn.c @ 26282:ea6b3aa222f1

merge of '96cf043274a971d5a2b9e01ef85fb60ca2a4bcd1' and 'd70375c084af2336e7fc6646fb778120b05de9a8'
author Paul Aurich <paul@darkrain42.org>
date Mon, 23 Mar 2009 03:06:36 +0000
parents a4fea5757d27
children 71dc3b5edbe7
comparison
equal deleted inserted replaced
26279:bdb34fc5d889 26282:ea6b3aa222f1