Diff

prosodyctl @ 5271:f716a3c58b4b

Merge 0.9->trunk
author Kim Alvefur <zash@zash.se>
date Wed, 26 Dec 2012 20:35:40 +0100
parent 5160:da7fe5de82fb
child 5303:19a4a3462574
line wrap: on
line diff