comparison pidgin/gtkimhtml.c @ 24796:400344647e5e

merge of 'b969d731bb18e8b2674e0dbe21b1f459dfe3347f' and 'dc893794fa32735e422a9ef5cab7e818e9ab38e4'
author Mark Doliner <mark@kingant.net>
date Thu, 18 Dec 2008 20:27:05 +0000
parents dce57ce0b860
children 01bd85f65fa1 ca01403251f1 a959b17ffc57
comparison
equal deleted inserted replaced
24795:2b4e9d5eed40 24796:400344647e5e