pidgin: 701b5025: merge of '31f78d91abb7452e597bbd0f20f910...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: 701b502563ce5e032aa60332fcbf9502f97a4e8d
Ancestor: 31f78d91abb7452e597bbd0f20f910c6cbb56099
Ancestor: f017580a3b23ad3050f63c88789c0229df75a8ee
Author: darkrain42 at pidgin.im
Date: 2009-06-07T18:46:23
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/701b502563ce5e032aa60332fcbf9502f97a4e8d

Modified files:
        ChangeLog libpurple/protocols/jabber/ping.c
        pidgin/plugins/pidginrc.c

ChangeLog: 

merge of '31f78d91abb7452e597bbd0f20f910c6cbb56099'
     and 'f017580a3b23ad3050f63c88789c0229df75a8ee'