pidgin: f5de7408: merge of '2b2413559685df17d16670e7769c19...

Sun Dec 14 18:15:44 EST 2008

-----------------------------------------------------------------
Revision: f5de7408fa8d5aed024aaa8c74d7a2d692816b21
Ancestor: 2b2413559685df17d16670e7769c19d61235fc28
Ancestor: 8b034c35a9f2c21bf8518d26554e162075186c07
Author: khc at pidgin.im
Date: 2008-12-14T23:11:27
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/f5de7408fa8d5aed024aaa8c74d7a2d692816b21

Modified files:
        libpurple/protocols/myspace/markup.c po/de.po

ChangeLog: 

merge of '2b2413559685df17d16670e7769c19d61235fc28'
     and '8b034c35a9f2c21bf8518d26554e162075186c07'