Diff

doc/names.txt @ 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 75:338e75cba18d
child 8728:41c959c5c84b
line wrap: on
line diff