Diff

prosodyctl @ 5945:51ead0aa3a02

Merge 0.9->0.10
author Matthew Wild <mwild1@gmail.com>
date Mon, 16 Dec 2013 02:04:16 +0000
parent 5809:be997c6a69be
child 6038:b3ceb7627e27
line wrap: on
line diff