Diff

prosodyctl @ 5599:34e9f237b915

Merge 0.9->trunk
author Kim Alvefur <zash@zash.se>
date Sat, 18 May 2013 13:20:46 +0200
parent 5592:5705e21ba24b
child 5610:f73d5fb4ea13
line wrap: on
line diff