diff po/ChangeLog @ 30948:7f1da2fbe7fc

propagate from branch 'im.pidgin.pidgin' (head a582dd339f019301adca693df4b1a8fb135a1774) to branch 'im.pidgin.cpw.malu.xmpp.google_relay' (head ed59323895a1ea93985fe761fbd1749dd8af5638)
author Marcus Lundblad <ml@update.uu.se>
date Sun, 06 Dec 2009 19:06:42 +0000
parents 4f4211e712b6
children 592d382e1bf4
line wrap: on
line diff