Diff

HACKERS @ 941:13ebec89b568

Automated merge with ssh://hg@prosody.im/prosody-hg
author Matthew Wild <mwild1@gmail.com>
date Mon, 30 Mar 2009 20:04:31 +0100
parent 527:98aaa20af6a2
child 1082:f58394b9ba66
line wrap: on
line diff