diff pidgin/gtkconv.c @ 31877:feb07422513c

merge of '8459331448aff4ed1551775d833a55e5fde5f543' and 'ad42fb62961cca268fce0b985556099fafd6b7ea'
author John Bailey <rekkanoryo@rekkanoryo.org>
date Fri, 25 Mar 2011 00:06:47 +0000
parents 9710b3226f11
children 7281d151e492 a9e077fb65e9
line wrap: on
line diff