comparison po/POTFILES.skip @ 30957:6d69151fa99b

Merge fix. There is still a change lost that should be re-introduced in libpurple/media
author Marcus Lundblad <ml@update.uu.se>
date Thu, 18 Feb 2010 22:20:06 +0000
parents c6233773ce1d
children
comparison
equal deleted inserted replaced
30956:ee3226c6092f 30957:6d69151fa99b