Comparison

prosodyctl @ 7263:015a711a8ccf

Merge 0.10->trunk
author Matthew Wild <mwild1@gmail.com>
date Thu, 10 Mar 2016 17:55:40 +0000
parent 7256:9fbb9fbf7e52
child 7269:cde4ef90cf3d
comparison
equal deleted inserted replaced
7256:9fbb9fbf7e52 7263:015a711a8ccf