diff libpurple/connection.h @ 26982:e22e1f45065d

merge of '6a6409370fa50e23bc8fdedcef230220fa680a36' and 'dd33cca1c5e6f5f7ea4cb392ed2954841617c1f1'
author Peter Hjalmarsson <xake@rymdraket.net>
date Mon, 18 May 2009 19:54:24 +0000
parents 375f82b53e95
children d8afc4ba7ce6 9407348dc714
line wrap: on
line diff