Diff

prosodyctl @ 6621:352fa2cae1c9

Merge 0.10->trunk
author Matthew Wild <mwild1@gmail.com>
date Fri, 03 Apr 2015 19:34:47 +0100
parent 6612:6cc48b51d699
child 6637:ecc039288edc
line wrap: on
line diff