pidgin: baabfd85: merge of '1f22186ba9290bcae0deaea09d4fd3...

[rlaager at pidgin.im]

-----------------------------------------------------------------
Revision: baabfd850dd02c15606049de180747cc916f6fa6
Ancestor: 1f22186ba9290bcae0deaea09d4fd38867f773e6
Ancestor: 8887c6d877944752bc2756d893d9b0acc81277a8
Author: rlaager at pidgin.im
Date: 2008-10-25T19:03:42
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/baabfd850dd02c15606049de180747cc916f6fa6

Modified files:
        ChangeLog libpurple/core.c

ChangeLog: 

merge of '1f22186ba9290bcae0deaea09d4fd38867f773e6'
     and '8887c6d877944752bc2756d893d9b0acc81277a8'