Diff

prosodyctl @ 6055:596539a30e9b

Merge 0.10->trunk
author Matthew Wild <mwild1@gmail.com>
date Wed, 02 Apr 2014 17:42:22 +0100
parent 6038:b3ceb7627e27
child 6062:6cc6b4d407df
line wrap: on
line diff