diff libpurple/purple-client.c @ 29719:5abe9f74a1de

merge of '0747e7c26eb81b2e5820123adcd39d463e5a0d11' and '350ddaad5f7b48249a35bb326383ec402d8a64b7'
author Paul Aurich <paul@darkrain42.org>
date Tue, 13 Apr 2010 02:50:55 +0000
parents 48d09d62912e
children
line wrap: on
line diff