Diff

AUTHORS @ 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 792:57c793b1575f
child 5403:d7ecf6cd584e
line wrap: on
line diff