comparison pidgin/gtkimhtml.c @ 22968:c0a8dbe36ffe

merge of '994f8bdccfcf73a73924e593d2c398c8d416e5e9' and '9d2e66fa6a8265d3cffb16f084ddb39903e0a36c'
author Etan Reisner <pidgin@unreliablesource.net>
date Wed, 14 May 2008 03:32:10 +0000
parents 900c7b5660d5
children f11fc3fb5b8c 25233b528b66 ac567757d236 1dd0e007514d
comparison
equal deleted inserted replaced
22936:5a359f6666c2 22968:c0a8dbe36ffe