diff COPYING @ 15430:2067ab51e9dc

merge of '53f08d189b9760ce37803245e4885502527b6025' and '65fe446d073e9f60ecdad1ecabbdfa887753d87a'
author Nathan Walp <nwalp@pidgin.im>
date Sat, 27 Jan 2007 02:06:37 +0000
parents a5ace2e037bc
children 44b4e8bd759b
line wrap: on
line diff