pidgin: c22043ed: merge of '8ff2ee29eabe00715f5da3d756f3bf...

[datallah at pidgin.im]

-----------------------------------------------------------------
Revision: c22043ed4b564d247db393d18a3de8df21981254
Ancestor: 8ff2ee29eabe00715f5da3d756f3bf52b9509879
Ancestor: cfa223b3386ae5aea84acf03fb9eb9b741364d29
Author: datallah at pidgin.im
Date: 2010-05-16T17:12:25
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/c22043ed4b564d247db393d18a3de8df21981254

Modified files:
        ChangeLog configure.ac libpurple/protocols/gg/lib/libgadu.h
        libpurple/protocols/oscar/snac.c pidgin/gtkdocklet-gtk.c
        pidgin/gtkimhtml.c

ChangeLog: 

merge of '8ff2ee29eabe00715f5da3d756f3bf52b9509879'
     and 'cfa223b3386ae5aea84acf03fb9eb9b741364d29'