pidgin: ec0f0d30: merge of '0c5825d5c8cf7e382a744e266bb4c6...

Sat May 29 21:16:00 EDT 2010

-----------------------------------------------------------------
Revision: ec0f0d305f86597a1f7e58b8d18a561e632f1257
Ancestor: 0c5825d5c8cf7e382a744e266bb4c67753d24db4
Ancestor: 25efd792c3cc52430ed464eaeb331c3ee9fd9ced
Author: rekkanoryo at pidgin.im
Date: 2010-05-30T00:46:45
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/ec0f0d305f86597a1f7e58b8d18a561e632f1257

Modified files:
        libpurple/protocols/msn/slplink.c libpurple/upnp.c
        po/POTFILES.in

ChangeLog: 

merge of '0c5825d5c8cf7e382a744e266bb4c67753d24db4'
     and '25efd792c3cc52430ed464eaeb331c3ee9fd9ced'