diff pidgin/gtkconn.c @ 30710:29e714e980b2

merge of 'c32c1fdff08db87b69fc0eb921a5eaafcb5ef67e' and 'fcd99a6bb8c6362d64f295a1b95a5b1130460b85'
author andrew.victor@mxit.com
date Fri, 28 May 2010 21:10:09 +0000
parents 71dc3b5edbe7
children af709c6ab032
line wrap: on
line diff