comparison libpurple/conversation.c @ 26270:15911f71e37f

merge of '73e463add9a124c86554c2958526e1a6ee5fc22f' and '9d2e2c1cd6d653a56af68a602532212502bd9317'
author Peter Hjalmarsson <xake@rymdraket.net>
date Mon, 16 Mar 2009 21:44:22 +0000
parents a6e3cb32cdd2
children b87843de7c6a d8e6a2d592a4 b98519a42e53
comparison
equal deleted inserted replaced
26268:3d997c09b94e 26270:15911f71e37f