Diff

prosodyctl @ 5203:a971bee1a5f5

Merge 0.9->trunk
author Kim Alvefur <zash@zash.se>
date Sun, 25 Nov 2012 05:12:46 +0100
parent 5160:da7fe5de82fb
child 5303:19a4a3462574
line wrap: on
line diff