diff pidgin/gtkconv.c @ 20723:9f2bc4396160

merge of '15fd625e20fae56881c7c728a6533fd1699c351c' and '3829f989342d787500e9abe363c89909db102f4b'
author Mark Doliner <mark@kingant.net>
date Sun, 30 Sep 2007 00:37:03 +0000
parents b7460582a135
children 591267f6f1d5 02df6998b466 15f61e6b15cd a59f65876d45 13ab08434a50
line wrap: on
line diff