diff COPYRIGHT @ 19343:ae5c82fd7920

merge of '24c8940605f5b11b2aea17c6ca6f3094dff141ab' and 'e1e5c6d6761c5ca78ed3ba45df742983421c1082'
author Ethan Blanton <elb@pidgin.im>
date Mon, 20 Aug 2007 17:42:51 +0000
parents 4e55f09f633c
children 6d94101c7d22 0d31b54d885a
line wrap: on
line diff