Mercurial > pidgin
diff libpurple/conversation.c @ 26737:8b7d1aed6d59
merge of '8ddbfe5d6f5c2455497d11ccbfff769ed4e9fad4'
and 'ef988478f33650d37a90cb7c58a9ac5af81b525b'
author | Paul Aurich <paul@darkrain42.org> |
---|---|
date | Tue, 28 Apr 2009 19:08:06 +0000 |
parents | 15ae2dea92b3 |
children | 1ba4bbd3b0cd e57315a062cb |