comparison COPYING @ 19137:51772173a916

Fixed a few merge errors
author Eric Polino <aluink@pidgin.im>
date Fri, 06 Jul 2007 01:08:22 +0000
parents a5ace2e037bc
children 44b4e8bd759b
comparison
equal deleted inserted replaced
19136:6b85cbfc80b7 19137:51772173a916