pidgin: 329e176f: merge of '288e82d5a18fb0bac91d9b4b737d47...

Mon Jun 9 15:05:48 EDT 2008

-----------------------------------------------------------------
Revision: 329e176fb12d63a4d133f0e832fb9400f4991235
Ancestor: 288e82d5a18fb0bac91d9b4b737d4788af8388ed
Ancestor: 2a1ff3497bb7597ba3712218a7142bb6b167b2b4
Author: sadrul at pidgin.im
Date: 2008-06-09T19:06:08
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/329e176fb12d63a4d133f0e832fb9400f4991235

Modified files:
        libpurple/protocols/oscar/oscar.c libpurple/win32/global.mak
        po/de.po share/ca-certs/Makefile.mingw

ChangeLog: 

merge of '288e82d5a18fb0bac91d9b4b737d4788af8388ed'
     and '2a1ff3497bb7597ba3712218a7142bb6b167b2b4'