diff COPYRIGHT @ 29765:f06142075dca

merge of '5fe1e44e0d84dfc0304df6902508315695625f42' and '8a990059c6b5604893eecc0949bd50938715ef58'
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Tue, 20 Apr 2010 03:40:44 +0000
parents b983db2b01f5
children 9e60e300541a
line wrap: on
line diff