Diff

prosodyctl @ 4945:06635b834e76

Merge 0.9->trunk
author Matthew Wild <mwild1@gmail.com>
date Sat, 07 Jul 2012 02:43:57 +0100
parent 4935:bc62abceef07
child 5024:d25e1b9332cc
line wrap: on
line diff