pidgin: b3991795: merge of '0747e7c26eb81b2e5820123adcd39d...

Mon Apr 12 22:55:43 EDT 2010

-----------------------------------------------------------------
Revision: b3991795b8e447eb9442d3dc68965c3ed71f6455
Ancestor: 0747e7c26eb81b2e5820123adcd39d463e5a0d11
Ancestor: 350ddaad5f7b48249a35bb326383ec402d8a64b7
Author: darkrain42 at pidgin.im
Date: 2010-04-13T02:50:55
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/b3991795b8e447eb9442d3dc68965c3ed71f6455

Modified files:
        ChangeLog libpurple/protocols/bonjour/jabber.c
        pidgin/plugins/timestamp_format.c

ChangeLog: 

merge of '0747e7c26eb81b2e5820123adcd39d463e5a0d11'
     and '350ddaad5f7b48249a35bb326383ec402d8a64b7'