diff COPYRIGHT @ 21148:3635ddf4170f

merge of '6f297cb9eebbeafa2feb340ad3f46f4157854b90' and '8a99c217891d1f2b2baaeaa0a98248f5eddfc160'
author Luke Schierer <lschiere@pidgin.im>
date Mon, 05 Nov 2007 22:03:58 +0000
parents 89c7be36fd61
children 6de09629f091
line wrap: on
line diff