Diff

COPYING @ 1759:4a280effc975

Automated merge with http://prosody.im/source/hg
author Tobias Markmann <tm@ayena.de>
date Sun, 06 Sep 2009 22:08:05 +0200 (2009-09-06)
parent 767:13ae298c67d7
child 4303:9f10476e1af4
line wrap: on
line diff