Diff

prosodyctl @ 5246:eba55873ef29

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