Revision 29faffdb83cb95042dc29b13e68a95460ca973cd

[sadrul at pidgin.im]

-----------------------------------------------------------------
Revision: 29faffdb83cb95042dc29b13e68a95460ca973cd
Ancestor: 2510b3bdf51be7bd339aca4a39ec86bf73c6716c
Ancestor: f7c31ba459e2ad06a7d5866a8591aa46f4cda7c2
Author: sadrul at pidgin.im
Date: 2007-09-13T02:17:31
Branch: im.pidgin.pidgin

Added files:
        pidgin/win32/nsis/translations/basque.nsh
Modified files:
        ChangeLog finch/gntconv.c libpurple/ntlm.c libpurple/proxy.c
        pidgin/Makefile.am pidgin/gtkconv.c
        pidgin/gtkimhtmltoolbar.c
        pidgin/win32/nsis/pidgin-installer.nsi po/ChangeLog

ChangeLog: 

merge of '2510b3bdf51be7bd339aca4a39ec86bf73c6716c'
     and 'f7c31ba459e2ad06a7d5866a8591aa46f4cda7c2'


To get the patch for this revision, please do this:
mtn log --last 1 --diffs --from 29faffdb83cb95042dc29b13e68a95460ca973cd