diff pidgin/gtkconv.c @ 30942:0712ce23901e

propagate from branch 'im.pidgin.pidgin' (head 37329f033a30f4f4f5048f9fdc86df4400e3ada5) to branch 'im.pidgin.cpw.malu.xmpp.google_relay' (head 19964a278756296718ce9887b3e8b98a575f9310)
author Marcus Lundblad <ml@update.uu.se>
date Mon, 09 Nov 2009 19:01:03 +0000
parents e7bb163434c7
children d7c49598cef2 3a055fbe806b e3206d6da6c7 40b523845a6e 585d6f844f79
line wrap: on
line diff