Diff

prosodyctl @ 5201:99cb5170a2ea

Merge 0.9->trunk
author Kim Alvefur <zash@zash.se>
date Fri, 23 Nov 2012 17:17:02 +0100
parent 5160:da7fe5de82fb
child 5303:19a4a3462574
line wrap: on
line diff