diff libpurple/conversation.h @ 26819:8b7d1aed6d59

merge of '8ddbfe5d6f5c2455497d11ccbfff769ed4e9fad4' and 'ef988478f33650d37a90cb7c58a9ac5af81b525b'
author Paul Aurich <paul@darkrain42.org>
date Tue, 28 Apr 2009 19:08:06 +0000
parents 15ae2dea92b3
children 63cb8c4f3c66 e57315a062cb
line wrap: on
line diff