Diff

tools/ejabberd2prosody.lua @ 5512:6ebea1e6795b

Merges all the way down
author Matthew Wild <mwild1@gmail.com>
date Tue, 23 Apr 2013 15:15:52 +0100
parent 5310:bc60cad47397
child 5696:9fba74a28e0c
line wrap: on
line diff