diff pidgin/gtkconv.c @ 22459:0daeabc1a185

merge of '1a03b83dbe8f941cb6de4ed3659bf7b2335d642d' and 'bda22ced802132e741a614cf3e67a599e9b08b0c'
author Stu Tomlinson <stu@nosnilmot.com>
date Thu, 13 Mar 2008 01:24:51 +0000
parents 8802eddbfedc
children 77b6ff5bdb07 efaecb71baad 9f67f9a58564
line wrap: on
line diff