diff COPYING @ 31273:db330f8c1a8c

merge of '6118d1117f31a7fc8db4bd5431af400a7b46ff17' and 'b28bde636d271fd90efcba54f25ecf7af2e5331b'
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Tue, 01 Mar 2011 06:24:50 +0000
parents 2341958e33b5
children
line wrap: on
line diff