diff COPYRIGHT @ 30911:6d99f7cdc654

merge of '833313a684a714d5138a37f30a635c00044f3b93' and 'd54eb6748669c3887900b9d4c71e351e7281e41e'
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Sat, 06 Nov 2010 03:46:35 +0000
parents a95e7ed3d7d2
children 1dcaaa68b245
line wrap: on
line diff