diff COPYRIGHT @ 16051:153c696be069

merge of '774a6ad28dbf02d6b0679f993a68134a43be527d' and 'a955a1b6a3db6fbbc9319faa295b841d6c39c660'
author Luke Schierer <lschiere@pidgin.im>
date Tue, 10 Apr 2007 22:23:13 +0000
parents a741ec4dafa0
children ca6798ec1d70
line wrap: on
line diff