comparison COPYING @ 26238:3e788c0db3a6

resolved conflict -- merged im.pidgin.pidgin to im.pidgin.soc.2008.yahoo
author Sulabh Mahajan <sulabh@soc.pidgin.im>
date Wed, 12 Nov 2008 10:23:13 +0000
parents 44b4e8bd759b
children 2341958e33b5
comparison
equal deleted inserted replaced
26237:eb21f65728c0 26238:3e788c0db3a6