comparison COPYING @ 25736:9ff63ec7d869

merge of '3fd2b0bf399bc4820c027060ec6c82ed1ca6ca45' and 'afa3dc92175256438bf5eb8acb7876eddc64ba01'
author Mike Ruprecht <maiku@soc.pidgin.im>
date Wed, 27 Aug 2008 00:12:57 +0000
parents 44b4e8bd759b
children 2341958e33b5
comparison
equal deleted inserted replaced
25735:4a208844bb63 25736:9ff63ec7d869