pidgin: ab51e5bb: merge of '48f2d27edd8466883a732524bff0e2...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: ab51e5bb7f7ddf6178238065899cccd6dcfc7271
Ancestor: 48f2d27edd8466883a732524bff0e292e343e6f5
Ancestor: ae5a2cd1da029523f7d734738a879d06c2178a4b
Author: darkrain42 at pidgin.im
Date: 2009-08-21T20:49:06
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/ab51e5bb7f7ddf6178238065899cccd6dcfc7271

Modified files:
        libpurple/protocols/jabber/caps.c
        libpurple/protocols/jabber/google.c po/hu.po

ChangeLog: 

merge of '48f2d27edd8466883a732524bff0e292e343e6f5'
     and 'ae5a2cd1da029523f7d734738a879d06c2178a4b'