diff libpurple/conversation.h @ 31619:3e53f6871805

merge of 'b8354dfc19eecdfd2aecfdb2685fbd78b9010587' and 'e406ff22b49f15b4ba4888f05f0e019b38575ea2'
author Paul Aurich <paul@darkrain42.org>
date Tue, 24 May 2011 01:48:26 +0000
parents d72d728226dc
children 5ffd5582f5fe 47f7b8ca6149
line wrap: on
line diff