diff pidgin/gtkconn.c @ 30568:0b2403172dee

merge of '215ef5d9abdd1383add930273847c6f71152f12e' and '7786ed6f7931081801ff5a3435820ed6f90ba2ca'
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Mon, 31 May 2010 06:58:02 +0000
parents 71dc3b5edbe7
children af709c6ab032
line wrap: on
line diff