diff COPYRIGHT @ 17885:31e6668f3a24

merge of '6e3524da31024398852895df04c5bda7269003af' and 'b20fe3f85060e3f1f285f85731ca9257fe294d89'
author Nathan Walp <nwalp@pidgin.im>
date Fri, 15 Jun 2007 16:35:38 +0000
parents cd2a9f9ca378
children 9a1c7a566d7c f71bd7e56389 bb2e5f6ff2b4
line wrap: on
line diff