Diff

prosodyctl @ 5088:d5bb9cd2e6df

Merge 0.9->trunk
author Matthew Wild <mwild1@gmail.com>
date Fri, 10 Aug 2012 16:32:40 +0100
parent 5024:d25e1b9332cc
child 5101:a94c43cad081
line wrap: on
line diff