comparison COPYING @ 32239:ac43f26c7f61

merge of '269c6e29c67a1c066871499e76575d4700bf6744' and 'f456e895f18adad6c0e3178c99a73f6fbd439487'
author Ethan Blanton <elb@pidgin.im>
date Thu, 11 Aug 2011 14:44:44 +0000
parents 2341958e33b5
children
comparison
equal deleted inserted replaced
32238:db4e78a1f46b 32239:ac43f26c7f61