diff COPYING @ 32590:0e94b0815349

This looks like a merge error. Fix it.
author masca@cpw.pidgin.im
date Wed, 07 Sep 2011 04:57:34 +0000
parents 2341958e33b5
children
line wrap: on
line diff