pidgin: e7abe204: merge of '6156c597e7d5a7702b6915a78bef09...

[qulogic at pidgin.im]

----------------------------------------------------------------------
Revision: e7abe20448d307649f623c608ecd470060b5f40d
Parent:   6156c597e7d5a7702b6915a78bef090253dd0090
Parent:   f88405b0b717173fb9fe55267ef7ae95fa07d29c
Author:   qulogic at pidgin.im
Date:     08/08/10 16:31:14
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/e7abe20448d307649f623c608ecd470060b5f40d

Changelog: 

merge of '6156c597e7d5a7702b6915a78bef090253dd0090'
     and 'f88405b0b717173fb9fe55267ef7ae95fa07d29c'

Changes against parent 6156c597e7d5a7702b6915a78bef090253dd0090

  patched  libpurple/protocols/msn/directconn.h

Changes against parent f88405b0b717173fb9fe55267ef7ae95fa07d29c

  patched  pidgin/win32/nsis/nsis_translations.desktop.in