comparison COPYING @ 15825:aabeea8c6c40

merge of '04fd9089e93e64f81bc6caafb8bd7805037cd3ad' and '50462290007872fbc71682021623547dfa477158'
author Nathan Walp <nwalp@pidgin.im>
date Mon, 19 Mar 2007 00:20:29 +0000
parents a5ace2e037bc
children 44b4e8bd759b
comparison
equal deleted inserted replaced
15818:bf7d258a26e6 15825:aabeea8c6c40