diff libpurple/conversation.c @ 31754:d6c47cc28870

merge of '60a632cb295df557713697e92727d551d7345451' and 'f0591ed5820261562bb9d8f49c75d08e3b334bfa'
author Paul Aurich <paul@darkrain42.org>
date Thu, 21 Jul 2011 05:37:06 +0000
parents afb58f3ee8f0
children c0a423e7fea4 3828a61c44da
line wrap: on
line diff