pidgin: cfb115ff: merge of '2c386633fb7a57f0cb963070eba463...

[rekkanoryo at pidgin.im]

-----------------------------------------------------------------
Revision: cfb115ff00c406f8011c0d661d33bee60813b27c
Ancestor: 2c386633fb7a57f0cb963070eba463721cf3728c
Ancestor: aeb5b7fdefe27d17110fd9fd660c7fe414bca12b
Author: rekkanoryo at pidgin.im
Date: 2008-12-19T00:12:10
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/cfb115ff00c406f8011c0d661d33bee60813b27c

Modified files:
        libpurple/protocols/oscar/peer.c po/ChangeLog po/de.po
        po/sr at latin.po

ChangeLog: 

merge of '2c386633fb7a57f0cb963070eba463721cf3728c'
     and 'aeb5b7fdefe27d17110fd9fd660c7fe414bca12b'