comparison po/ne.po @ 26236:618d122af044

resolving conflict - merging im.pidgin.pidgin to im.pidgin.soc.2008.yahoo
author Sulabh Mahajan <sulabh@soc.pidgin.im>
date Wed, 12 Nov 2008 10:17:38 +0000
parents e0bcb8cfda74
children 8feb0b33e8d5
comparison
equal deleted inserted replaced
26235:1317a9ae66e8 26236:618d122af044