Diff

README @ 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
parent 1391:b910ef82622d
child 2665:c26bfc0359bb
line wrap: on
line diff