diff pidgin/gtkconv.c @ 22301:3ed2c259f656

merge of '24f58c58bb8d22c0e8e6c5ce43c536c47b719bc6' and 'f36a38ba9c1222e8ef6f0b946b33c41abbfae0ce'
author Jeffrey Connelly <jaconnel@calpoly.edu>
date Sat, 16 Feb 2008 20:02:36 +0000
parents 36036b9489fe
children 63f102c210ad 02eda4bd2b22 056fb36a5770
line wrap: on
line diff